From 4c39210f8f52a669ff8cd0942d9bf88326a3f8b1 Mon Sep 17 00:00:00 2001
From: Anton Filimonov <anton.filimonov@gmail.com>
Date: Wed, 23 Mar 2022 10:25:27 +0100
Subject: [PATCH] build: fix qt6 build on windows

---
 src/app/main.cpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 0f7dc9b9f..fe3f46d63 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -84,11 +84,14 @@ void setApplicationAttributes( bool enableQtHdpi, int scaleFactorRounding )
     qputenv( "QT_BEARER_POLL_TIMEOUT", QByteArray::number( std::numeric_limits<int>::max() ) );
 
 #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
-    if ( enableQtHdpi ) {
-        // This attribute must be set before QGuiApplication is constructed:
-        QCoreApplication::setAttribute( Qt::AA_EnableHighDpiScaling );
-        // We support high-dpi (aka Retina) displays
-        QCoreApplication::setAttribute( Qt::AA_UseHighDpiPixmaps );
+#ifdef Q_OS_WIN
+    QCoreApplication::setAttribute( Qt::AA_DisableWindowContextHelpButton );
+#endif
+
+    if ( !enableQtHdpi ) {
+        QCoreApplication::setAttribute( Qt::AA_DisableHighDpiScaling );
+    }
+    else {
 
 #if QT_VERSION >= QT_VERSION_CHECK( 5, 14, 0 )
         QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
@@ -96,9 +99,11 @@ void setApplicationAttributes( bool enableQtHdpi, int scaleFactorRounding )
 #else
         Q_UNUSED( scaleFactorRounding );
 #endif
-    }
-    else {
-        QCoreApplication::setAttribute( Qt::AA_DisableHighDpiScaling );
+
+        // This attribute must be set before QGuiApplication is constructed:
+        QCoreApplication::setAttribute( Qt::AA_EnableHighDpiScaling );
+        // We support high-dpi (aka Retina) displays
+        QCoreApplication::setAttribute( Qt::AA_UseHighDpiPixmaps );
     }
 #else
     Q_UNUSED( enableQtHdpi );
@@ -106,10 +111,6 @@ void setApplicationAttributes( bool enableQtHdpi, int scaleFactorRounding )
 #endif
 
     QCoreApplication::setAttribute( Qt::AA_DontShowIconsInMenus );
-
-#ifdef Q_OS_WIN
-    QCoreApplication::setAttribute( Qt::AA_DisableWindowContextHelpButton );
-#endif
 }
 
 int main( int argc, char* argv[] )