From b4d26ba952e4e0093eadeb87fbd8d6776cc3c327 Mon Sep 17 00:00:00 2001
From: ckamm <mail@ckamm.de>
Date: Mon, 27 Jun 2016 16:17:58 +0200
Subject: [PATCH] Fix windows HiDPI #4994 (#4998)

This was removed in 0194ebb2229adc33f5b9790231a3384b46474bde
because it breaks on Linux. However, it looks like it is correct
for Windows. In the meantime the surrounding ifdef has changed
from !Q_OS_MAC to Q_OS_WIN, so reverting it makes sense.
---
 src/gui/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index d57534490d..003fcfd51c 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -58,6 +58,8 @@ int main(int argc, char **argv)
     // not set this envoronment variable)
 #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
+#else
+    qputenv("QT_DEVICE_PIXEL_RATIO", "auto"); // See #4840, #4994
 #endif
 #endif // !Q_OS_WIN