Merge branch 'release/2.1.3' into develop

This commit is contained in:
Janek Bevendorff 2017-02-20 01:14:13 +01:00
commit 22f161d178
No known key found for this signature in database
GPG Key ID: CFEC2F6850BFFA53

View File

@ -18,7 +18,6 @@
#include <QCommandLineParser>
#include <QFile>
#include <QTextStream>
#include <QtGlobal>
#include "config-keepassx.h"
#include "core/Config.h"
@ -45,10 +44,7 @@ int main(int argc, char** argv)
Tools::disableCoreDumps();
#endif
Tools::setupSearchPaths();
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif
Application app(argc, argv);
Application::setApplicationName("keepassxc");
Application::setApplicationVersion(KEEPASSX_VERSION);