projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show IRC server error messages when unexpected
[quassel.git]
/
src
/
common
/
main.cpp
diff --git
a/src/common/main.cpp
b/src/common/main.cpp
index
2bbe0cf
..
1f39731
100644
(file)
--- a/
src/common/main.cpp
+++ b/
src/common/main.cpp
@@
-163,6
+163,8
@@
int main(int argc, char **argv)
cliParser->addOption("oidentd-conffile", 0, "Set path to oidentd configuration file", "file");
#ifdef HAVE_SSL
cliParser->addSwitch("require-ssl", 0, "Require SSL for remote (non-loopback) client connections");
cliParser->addOption("oidentd-conffile", 0, "Set path to oidentd configuration file", "file");
#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");
+ cliParser->addOption("ssl-key", 0, "Specify the path to the SSL key", "path", "ssl-cert-path");
#endif
cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)");
#endif
#endif
cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)");
#endif
@@
-175,13
+177,19
@@
int main(int argc, char **argv)
}
#endif
}
#endif
-#
if defined BUILD_CORE
+#if defined BUILD_CORE
CoreApplication app(argc, argv);
CoreApplication app(argc, argv);
-# elif defined BUILD_QTUI
+#elif defined BUILD_QTUI
+# if QT_VERSION >= 0x050600
+ QtUiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+# endif
QtUiApplication app(argc, argv);
QtUiApplication app(argc, argv);
-# elif defined BUILD_MONO
+#elif defined BUILD_MONO
+# if QT_VERSION >= 0x050600
+ MonolithicApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+# endif
MonolithicApplication app(argc, argv);
MonolithicApplication app(argc, argv);
-#
endif
+#endif
#ifndef HAVE_KDE4
// the non-KDE version parses after app has been instantiated
#ifndef HAVE_KDE4
// the non-KDE version parses after app has been instantiated