From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 17 Jun 2018 14:01:11 +0000 (+0200)
Subject: icons: Don't offer the Oxygen fallback if not enabled in CMake
X-Git-Tag: travis-deploy-test~4
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=470591c38960f9107d4808a81b0cae95cfe9c3e8;hp=6d4c6dd41bd39d173e1ca187a989660b76299325

icons: Don't offer the Oxygen fallback if not enabled in CMake

If -DWITH_OXYGEN_ICONS is disabled, Quassel will not install its
own Oxygen icons, and thus those would be missing if Oxygen were
chosen as a fallback.

Ensure that the fallback isn't offered in this case even if there
happens to be a (runtime-detected) system installation of Oxygen.
---

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index 3ef32014..d849fc55 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -274,7 +274,9 @@ std::vector<std::pair<QString, QString>> QtUi::availableIconThemes() const
     static const std::vector<std::pair<QString, QString>> supported {
         { "breeze", tr("Breeze") },
         { "breeze-dark", tr("Breeze Dark") },
+#ifdef WITH_OYGEN_ICONS
         { "oxygen", tr("Oxygen") }
+#endif
     };
 
     std::vector<std::pair<QString, QString>> result;