diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2017-05-12 18:35:18 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2017-05-15 12:08:35 +0000 |
| commit | 36c8227cafb58a97b28aadb12c14218337da9c64 (patch) | |
| tree | 2414c4d6a06b6e73a9784c4db7830ce5c0f0b546 /src/app | |
| parent | c9a9aadde7c8f39880831a7cf789eea38063acd6 (diff) | |
App: (Re-)enable automatic HighDPI scaling for Linux
The original reason for disabling HighDPI scaling on Linux in
7da2b4a3cbaa4cc74468ccd4e7898cc85467b2fc was unhinted fonts for non-
scaled scenario: QTBUG-46435. That issue had been fixed long ago:
0f7bc885aa7ae8cc3c448cc751aba4eba8c1c8b8
HighDPI support on Linux should by now be good enough to give it another
try by default.
Change-Id: I5b74f46310254c2916a2f16a7655d9f096453cc3
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 97a509757b2..feecacb858f 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -161,7 +161,7 @@ static const char *setHighDpiEnvironmentVariable() { const char* envVarName = 0; static const char ENV_VAR_QT_DEVICE_PIXEL_RATIO[] = "QT_DEVICE_PIXEL_RATIO"; - if (Utils::HostOsInfo().isWindowsHost() + if (!Utils::HostOsInfo().isMacHost() && !qEnvironmentVariableIsSet(ENV_VAR_QT_DEVICE_PIXEL_RATIO) // legacy in 5.6, but still functional && !qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR") && !qEnvironmentVariableIsSet("QT_SCALE_FACTOR") |