X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=9bf99cf2d1c1c2a057ad805f2f5d12b5f23a1f51;hp=7884dfa686e0716e08b17f856d251154ebe661cf;hb=921e54680da16fcf2adb7a90506875aceb6633a4;hpb=c3c6809d89bd860cb74c7cc1336f190cfe97a3b9

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 7884dfa6..9bf99cf2 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -67,17 +67,16 @@ int main(int argc, char **argv)
     Q_INIT_RESOURCE(sql);
 #endif
 #ifndef BUILD_CORE
-    Q_INIT_RESOURCE(pics); // always in a resource, for now
+    Q_INIT_RESOURCE(pics);
+    Q_INIT_RESOURCE(hicolor);
 #endif
 
 #ifdef EMBED_DATA
     Q_INIT_RESOURCE(i18n);
 # ifndef BUILD_CORE
     Q_INIT_RESOURCE(data);
-    Q_INIT_RESOURCE(hicolor);
-    Q_INIT_RESOURCE(oxygen);
 #   ifdef WITH_OXYGEN
-    Q_INIT_RESOURCE(oxygen_kde);
+    Q_INIT_RESOURCE(oxygen);
 #   endif
 # endif
 #endif
@@ -117,6 +116,7 @@ int main(int argc, char **argv)
 
 #ifndef BUILD_CORE
     // put client-only arguments here
+    cliParser->addOption("icontheme <theme>", 0, "Override the system icon theme ('oxygen' is recommended)");
     cliParser->addOption("qss <file.qss>", 0, "Load a custom application stylesheet");
     cliParser->addSwitch("debugbufferswitches", 0, "Enables debugging for bufferswitches");
     cliParser->addSwitch("debugmodel", 0, "Enables debugging for models");