summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2017-09-27 12:01:10 +0300
committerKatja Marttila <katja.marttila@qt.io>2017-10-26 05:43:34 +0000
commit0a11320bd0007e9a83b9857af9b97015acfe4b1c (patch)
tree50fbc59c5b36a4fd172d2e979c755fb731318a4d
parent7238910303b9ff423228b37409b1c0d9e6ca2048 (diff)
Enable HighDPI support only in Windows
Enabling HighDPI looks crappy in Linux. In MacOS this flag is not supported so enable it only in Windows host. Change-Id: I15167e45371daab1176b0043802bdc8a6954d67d Reviewed-by: Antti Kokko <antti.kokko@qt.io>
-rw-r--r--src/sdk/main.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp
index 70c675f91..46165b214 100644
--- a/src/sdk/main.cpp
+++ b/src/sdk/main.cpp
@@ -58,7 +58,13 @@ static const char PLACEHOLDER[32] = "MY_InstallerCreateDateTime_MY";
int main(int argc, char *argv[])
{
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+#if defined(Q_OS_WIN)
+ if (!qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR")
+ && !qEnvironmentVariableIsSet("QT_SCALE_FACTOR")
+ && !qEnvironmentVariableIsSet("QT_SCREEN_SCALE_FACTORS")) {
+ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+ }
+#endif
// increase maximum numbers of file descriptors
#if defined (Q_OS_OSX)
QCoreApplication::setSetuidAllowed(true);