From 18da551a3f25fad2d11fa34bfdd46d5943e65e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B5=AE=E7=94=9F=E8=8B=A5=E6=A2=A6?= <1070753498@qq.com>
Date: Wed, 20 Sep 2023 18:42:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96setHighDpiEnvironmentVariable?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/app/main.cc         | 5 ++---
 apps/crashreport/main.cc | 5 ++---
 utils/utils.cpp          | 6 ------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/apps/app/main.cc b/apps/app/main.cc
index 36b887f..b95ec43 100644
--- a/apps/app/main.cc
+++ b/apps/app/main.cc
@@ -45,12 +45,11 @@ void setQss()
 auto main(int argc, char *argv[]) -> int
 {
 #if defined(Q_OS_WIN) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    if (!qEnvironmentVariableIsSet("QT_OPENGL"))
+    if (!qEnvironmentVariableIsSet("QT_OPENGL")) {
         QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
+    }
 #else
     qputenv("QSG_RHI_BACKEND", "opengl");
-    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
-        Qt::HighDpiScaleFactorRoundingPolicy::Round);
 #endif
     Utils::setHighDpiEnvironmentVariable();
     SharedTools::QtSingleApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
diff --git a/apps/crashreport/main.cc b/apps/crashreport/main.cc
index 512d527..e00d437 100644
--- a/apps/crashreport/main.cc
+++ b/apps/crashreport/main.cc
@@ -40,12 +40,11 @@ void setQss()
 auto main(int argc, char *argv[]) -> int
 {
 #if defined(Q_OS_WIN) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    if (!qEnvironmentVariableIsSet("QT_OPENGL"))
+    if (!qEnvironmentVariableIsSet("QT_OPENGL")) {
         QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
+    }
 #else
     qputenv("QSG_RHI_BACKEND", "opengl");
-    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
-        Qt::HighDpiScaleFactorRoundingPolicy::Round);
 #endif
     Utils::setHighDpiEnvironmentVariable();
     SharedTools::QtSingleApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
diff --git a/utils/utils.cpp b/utils/utils.cpp
index e6fd3b9..c43138d 100644
--- a/utils/utils.cpp
+++ b/utils/utils.cpp
@@ -100,11 +100,6 @@ void Utils::setHighDpiEnvironmentVariable()
     if (Utils::HostOsInfo::isMacHost()) {
         return;
     }
-    if (Utils::HostOsInfo::isWindowsHost() && !qEnvironmentVariableIsSet("QT_OPENGL")) {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-        QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
-#endif
-    }
 
     if (Utils::HostOsInfo::isWindowsHost()
         && !qEnvironmentVariableIsSet("QT_DEVICE_PIXEL_RATIO") // legacy in 5.6, but still functional
@@ -113,7 +108,6 @@ void Utils::setHighDpiEnvironmentVariable()
         && !qEnvironmentVariableIsSet("QT_SCREEN_SCALE_FACTORS")) {
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-        QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif
     }