Commit 2a197ed9 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Revert "App: (Re-)enable automatic HighDPI scaling for Linux"

It breaks running over PuTTY with VcxSrv.

This reverts commit 36c8227c.

Task-number: QTCREATORBUG-18467
Change-Id: Id93497ee24cdb574d1e4a1ac1b0fb112012a695d
Reviewed-by: Eike Ziller's avatarEike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale's avatarAlessandro Portale <alessandro.portale@qt.io>
parent 0d06dbb5
...@@ -161,7 +161,7 @@ static const char *setHighDpiEnvironmentVariable() ...@@ -161,7 +161,7 @@ static const char *setHighDpiEnvironmentVariable()
{ {
const char* envVarName = 0; const char* envVarName = 0;
static const char ENV_VAR_QT_DEVICE_PIXEL_RATIO[] = "QT_DEVICE_PIXEL_RATIO"; 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(ENV_VAR_QT_DEVICE_PIXEL_RATIO) // legacy in 5.6, but still functional
&& !qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR") && !qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR")
&& !qEnvironmentVariableIsSet("QT_SCALE_FACTOR") && !qEnvironmentVariableIsSet("QT_SCALE_FACTOR")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment