优化setHighDpiEnvironmentVariable函数；

RealChuan · Sep 20, 2023 · 18da551 · 18da551
1 parent d2d9cc8
commit 18da551
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
     }