From 269143a0d93062bea25619615fe2e63fe5aea43f Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Wed, 4 Aug 2021 17:46:14 +0200
Subject: [PATCH] App: Replace DisableHighDpiScaling with
 HighDpiScaleFactorRoundingPolicy

AA_DisableHighDpiScaling is deprecated and ignored in Qt 6.
The next best option is to use Qt::HighDpiScaleFactorRoundingPolicy::Floor
instead.

Change-Id: Ic279ac34f744dec2558624799809007bbb638431
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/app/main.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 6a2d518da06..d3946584e3c 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -289,6 +289,13 @@ static void setHighDpiEnvironmentVariable()
         QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
             Qt::HighDpiScaleFactorRoundingPolicy::Round);
 #endif
+
+#endif
+    } else {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        /* AA_DisableHighDpiScaling is deprecated */
+        QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
+            Qt::HighDpiScaleFactorRoundingPolicy::Floor);
 #endif
     }
 }