projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable Qt's high-DPI scaling introduced in Qt5.6
[quassel.git]
/
src
/
common
/
main.cpp
diff --git
a/src/common/main.cpp
b/src/common/main.cpp
index
b13d3ee
..
01d9d82
100644
(file)
--- a/
src/common/main.cpp
+++ b/
src/common/main.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-103,13
+103,6
@@
int main(int argc, char **argv)
# endif
#endif
# endif
#endif
- // Migrate settings from KDE4 to KF5 if appropriate
-#ifdef HAVE_KF5
- Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName());
- migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc");
- migrator.migrate();
-#endif
-
AbstractCliParser *cliParser;
#ifdef HAVE_KDE4
AbstractCliParser *cliParser;
#ifdef HAVE_KDE4
@@
-170,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
@@
-182,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
@@
-198,6
+199,13
@@
int main(int argc, char **argv)
}
#endif
}
#endif
+// Migrate settings from KDE4 to KF5 if appropriate
+#ifdef HAVE_KF5
+ Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName());
+ migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc");
+ migrator.migrate();
+#endif
+
#ifdef HAVE_KF5
// FIXME: This should be done after loading the translation catalogue, but still in main()
AboutData aboutData;
#ifdef HAVE_KF5
// FIXME: This should be done after loading the translation catalogue, but still in main()
AboutData aboutData;