diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-08-19 09:54:26 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-08-19 11:41:54 +0000 |
commit | de3b2b6493c810380e961bb8b36b805a505b55b7 (patch) | |
tree | 4fadc73a2d4e7b6cb7d19ce979d9b673216cc06c /src/app | |
parent | 6d77db9e6a0ef1080c7880fe852fec103bc75642 (diff) | |
download | qt-creator-de3b2b6493c810380e961bb8b36b805a505b55b7.tar.gz |
Limit legacy Highdpi tweaks to Qt versions < 5.6.
As of Qt 5.6, Qt will scale automatically. The font hinting
issues on non-Windows OS should also be fixed.
This silences the warning about using the legacy
QT_DEVICE_PIXEL_RATIO variable.
Change-Id: Icc78d990fae67bbd39a57fa1f5b08c592dc9e2ce
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/app')
-rw-r--r-- | src/app/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index d2fa179bdd..3e9a523823 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -292,10 +292,13 @@ static inline QSettings *userSettings() int main(int argc, char **argv) { +#if (QT_VERSION < QT_VERSION_CHECK(5, 6, 0)) if (Utils::HostOsInfo().isWindowsHost() && !qEnvironmentVariableIsSet("QT_DEVICE_PIXEL_RATIO")) { qputenv("QT_DEVICE_PIXEL_RATIO", "auto"); } +#endif // < Qt 5.6 + QLoggingCategory::setFilterRules(QLatin1String("qtc.*.debug=false")); #ifdef Q_OS_MAC // increase the number of file that can be opened in Qt Creator. |