X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.cpp;h=3d1d3780a09cb591cba4f27b75929cd381cbbbcf;hb=f11377872cde42c47b3354b8e660cb2025ceffd8;hp=5bf11bbee9e6a21f430204e1eedaa0f1cb6efa94;hpb=7de4debb5a6744d9f67cb09c5fc0aa136f05be96;p=quassel.git

diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
index 5bf11bbe..3d1d3780 100644
--- a/src/qtui/qtuiapplication.cpp
+++ b/src/qtui/qtuiapplication.cpp
@@ -68,10 +68,6 @@ QtUiApplication::QtUiApplication(int &argc, char **argv)
 #else
     qInstallMessageHandler(Client::logMessage);
 #endif
-
-    // Some platforms don't set a default icon theme; chances are we can find our bundled Oxygen theme though
-    if (QIcon::themeName().isEmpty())
-        QIcon::setThemeName("oxygen");
 }
 
 
@@ -122,6 +118,13 @@ bool QtUiApplication::init()
             return false;
         }
 
+        // Set the icon theme
+        if (Quassel::isOptionSet("icontheme"))
+            QIcon::setThemeName(Quassel::optionValue("icontheme"));
+        else if (QIcon::themeName().isEmpty())
+            // Some platforms don't set a default icon theme; chances are we can find our bundled Oxygen theme though
+            QIcon::setThemeName("oxygen");
+
         // session resume
         QtUi *gui = new QtUi();
         Client::init(gui);