From 2a197ed9bf6f0b959048e1835054352d7e6e5bf0 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 9 Jul 2017 17:19:38 +0300
Subject: [PATCH] Revert "App: (Re-)enable automatic HighDPI scaling for Linux"
It breaks running over PuTTY with VcxSrv.
This reverts commit 36c8227cafb58a97b28aadb12c14218337da9c64.
Task-number: QTCREATORBUG-18467
Change-Id: Id93497ee24cdb574d1e4a1ac1b0fb112012a695d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
src/app/main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/main.cpp b/src/app/main.cpp
index d7c92a6c92f..374ae667497 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().isMacHost()
+ if (Utils::HostOsInfo().isWindowsHost()
&& !qEnvironmentVariableIsSet(ENV_VAR_QT_DEVICE_PIXEL_RATIO) // legacy in 5.6, but still functional
&& !qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR")
&& !qEnvironmentVariableIsSet("QT_SCALE_FACTOR")
--
GitLab