#if QT_VERSION < 0x050000
// All our source files are in UTF-8, and Qt5 even requires that
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
#if QT_VERSION < 0x050000
// All our source files are in UTF-8, and Qt5 even requires that
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
#if QT_VERSION < 0x050000 && defined Q_OS_MAC && !defined BUILD_CORE
QApplication::setGraphicsSystem("raster");
#endif
#if QT_VERSION < 0x050000 && defined Q_OS_MAC && !defined BUILD_CORE
QApplication::setGraphicsSystem("raster");
#endif
+//Setup the High-DPI settings
+# if QT_VERSION >= 0x050600 && defined(Q_OS_WIN)
+ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); //Added in Qt 5.6
+#endif
+# if QT_VERSION >= 0x050400
+ //Added in the early Qt5 versions (5.0?)- use 5.4 as the cutoff since lots of high-DPI work was added then
+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+# endif
-# ifdef WITH_OXYGEN
- Q_INIT_RESOURCE(oxygen);
-# endif
-# ifdef WITH_BREEZE
- Q_INIT_RESOURCE(breeze);
-# endif
-# ifdef WITH_BREEZE_DARK
- Q_INIT_RESOURCE(breezedark);
+ Q_INIT_RESOURCE(breeze_icons);
+ Q_INIT_RESOURCE(breeze_dark_icons);
+# ifdef WITH_OXYGEN_ICONS
+ Q_INIT_RESOURCE(oxygen_icons);
+# endif
+# ifdef WITH_BUNDLED_ICONS
+ Q_INIT_RESOURCE(breeze_icon_theme);
+ Q_INIT_RESOURCE(breeze_dark_icon_theme);
+# ifdef WITH_OXYGEN_ICONS
+ Q_INIT_RESOURCE(oxygen_icon_theme);
ki18n("A modern, distributed IRC client"));
aboutData.addLicense(KAboutData::License_GPL_V2);
aboutData.addLicense(KAboutData::License_GPL_V3);
ki18n("A modern, distributed IRC client"));
aboutData.addLicense(KAboutData::License_GPL_V2);
aboutData.addLicense(KAboutData::License_GPL_V3);
aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8());
KCmdLineArgs::init(argc, argv, &aboutData);
aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8());
KCmdLineArgs::init(argc, argv, &aboutData);
cliParser->addOption("configdir", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL certificate", "path");
#endif
cliParser->addOption("datadir", 0, "DEPRECATED - Use --configdir instead", "path");
cliParser->addOption("configdir", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL certificate", "path");
#endif
cliParser->addOption("datadir", 0, "DEPRECATED - Use --configdir instead", "path");
+ cliParser->addOption("loglevel", 'L', "Loglevel Debug|Info|Warning|Error", "level", "Info");
+#ifdef HAVE_SYSLOG
+ cliParser->addSwitch("syslog", 0, "Log to syslog");
+#endif
+ cliParser->addOption("logfile", 'l', "Log to a file", "path");
cliParser->addOption("listen", 0, "The address(es) quasselcore will listen on", "<address>[,<address>[,...]]", "::,0.0.0.0");
cliParser->addOption("port", 'p', "The port quasselcore will listen at", "port", "4242");
cliParser->addSwitch("norestore", 'n', "Don't restore last core's state");
cliParser->addOption("listen", 0, "The address(es) quasselcore will listen on", "<address>[,<address>[,...]]", "::,0.0.0.0");
cliParser->addOption("port", 'p', "The port quasselcore will listen at", "port", "4242");
cliParser->addSwitch("norestore", 'n', "Don't restore last core's state");
- cliParser->addOption("loglevel", 'L', "Loglevel Debug|Info|Warning|Error", "level", "Info");
-#ifdef HAVE_SYSLOG
- cliParser->addSwitch("syslog", 0, "Log to syslog");
-#endif
- cliParser->addOption("logfile", 'l', "Log to a file", "path");
+ cliParser->addSwitch("config-from-environment", 0, "Load configuration from environment variables");
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->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->addOption("oidentd-conffile", 0, "Set path to oidentd configuration file", "file");
cliParser->addOption("oidentd-conffile", 0, "Set path to oidentd configuration file", "file");
+ cliParser->addSwitch("strict-ident", 0, "Use users' quasselcore username as ident reply. Ignores each user's configured ident setting.");
+ cliParser->addSwitch("ident-daemon", 0, "Enable internal ident daemon");
+ cliParser->addOption("ident-port", 0, "The port quasselcore will listen at for ident requests. Only meaningful with --ident-daemon", "port", "10113");
#ifdef HAVE_SSL
cliParser->addSwitch("require-ssl", 0, "Require SSL for remote (non-loopback) client connections");
cliParser->addOption("ssl-cert", 0, "Specify the path to the SSL Certificate", "path", "configdir/quasselCert.pem");
#ifdef HAVE_SSL
cliParser->addSwitch("require-ssl", 0, "Require SSL for remote (non-loopback) client connections");
cliParser->addOption("ssl-cert", 0, "Specify the path to the SSL Certificate", "path", "configdir/quasselCert.pem");
-# if QT_VERSION >= 0x050600 && defined(Q_OS_WIN)
- MonolithicApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
-# if QT_VERSION >= 0x050700
- MonolithicApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-# endif