X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fmain.cpp;h=71579df4380df8f84eeeae9de82aa947db9714a6;hb=45affd4fa815bb21d0b2e46ac80114bb9174f801;hp=d9dcdc6f54c15239a277b94c9f0365e28685385a;hpb=11a1e4372551439769eafba3f3f5403adff763fb;p=quassel.git

diff --git a/src/common/main.cpp b/src/common/main.cpp
index d9dcdc6f..71579df4 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -146,7 +146,7 @@ int main(int argc, char **argv)
 
 #ifndef BUILD_CORE
     // put client-only arguments here
-    cliParser->addOption("icontheme", 0, "Override the system icon theme ('oxygen' is recommended)", "theme");
+    cliParser->addOption("icontheme", 0, "Override the system icon theme ('breeze' is recommended)", "theme");
     cliParser->addOption("qss", 0, "Load a custom application stylesheet", "file.qss");
     cliParser->addSwitch("debugbufferswitches", 0, "Enables debugging for bufferswitches");
     cliParser->addSwitch("debugmodel", 0, "Enables debugging for models");
@@ -163,6 +163,7 @@ int main(int argc, char **argv)
 #endif
     cliParser->addOption("logfile", 'l', "Log to a file", "path");
     cliParser->addOption("select-backend", 0, "Switch storage backend (migrating data if possible)", "backendidentifier");
+    cliParser->addOption("select-authenticator", 0, "Select authentication backend", "authidentifier");
     cliParser->addSwitch("add-user", 0, "Starts an interactive session to add a new core user");
     cliParser->addOption("change-userpass", 0, "Starts an interactive session to change the password of the user identified by <username>", "username");
     cliParser->addSwitch("oidentd", 0, "Enable oidentd integration");
@@ -186,13 +187,19 @@ int main(int argc, char **argv)
 #if defined BUILD_CORE
     CoreApplication app(argc, argv);
 #elif defined BUILD_QTUI
-# if QT_VERSION >= 0x050600
+# if QT_VERSION >= 0x050600 && defined(Q_OS_WIN)
     QtUiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+#endif
+# if QT_VERSION >= 0x050700
+    QtUiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 # endif
     QtUiApplication app(argc, argv);
 #elif defined BUILD_MONO
-# if QT_VERSION >= 0x050600
+# if QT_VERSION >= 0x050600 && defined(Q_OS_WIN)
     MonolithicApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+#endif
+# if QT_VERSION >= 0x050700
+    MonolithicApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 # endif
     MonolithicApplication app(argc, argv);
 #endif
@@ -201,7 +208,7 @@ int main(int argc, char **argv)
     // the non-KDE version parses after app has been instantiated
     if (!cliParser->init(app.arguments())) {
         cliParser->usage();
-        return false;
+        return EXIT_FAILURE;
     }
 #endif