Merge branch 'me/hidpi_win' into junior

Author: iakov

qrgui/mainWindow/application.exe.manifest

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0">
+
+  <!-- Enable use of version 6 of the common controls (Win XP and later) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32"
+                        name="Microsoft.Windows.Common-Controls"
+                        version="6.0.0.0"
+                        processorArchitecture="*"
+                        publicKeyToken="6595b64144ccf1df"
+                        language="*" />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+  <!-- Indicate UAC compliance, with no need for elevated privileges (Win Vista and later) -->
+  <!-- (if you need enhanced privileges, set the level to "highestAvailable" or "requireAdministrator") -->
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <!-- Indicate high API awareness (Win Vista and later) -->
+  <!-- (if you support per-monitor high DPI, set this to "True/PM") -->
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <gdiScaling xmlns="http://schemas.microsoft.com/SMI/2017/WindowsSettings">true</gdiScaling>	
+    </windowsSettings>
+  </application>
+
+  <!-- Declare support for various versions of Windows -->
+  <ms_compatibility:compatibility xmlns:ms_compatibility="urn:schemas-microsoft-com:compatibility.v1" xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <ms_compatibility:application>
+      <!-- Windows 7/Server 2008 R2 -->
+      <ms_compatibility:supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+      <!-- Windows 8/Server 2012 -->
+      <ms_compatibility:supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+      <!-- Windows 8.1/Server 2012 R2 -->
+      <ms_compatibility:supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+      <!-- Windows 10 -->
+      <ms_compatibility:supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </ms_compatibility:application>
+  </ms_compatibility:compatibility>
+</assembly>

qrgui/mainWindow/mainWindow.pro

@@ -155,10 +155,12 @@ RESOURCES = $$PWD/mainWindow.qrc
 
 win32 {
 	RC_FILE = $$PWD/mainWindow.rc
+        QMAKE_MANIFEST = $$PWD/application.exe.manifest
+        DISTFILES += $$QMAKE_MANIFEST
 }
 
 macx {
-	ICON = icon.icns
+        ICON = icon.icns
 }
 
 include(scriptAPI/scriptAPI.pri)

qrkernel/platformInfo.cpp

@@ -22,11 +22,7 @@
 #include <QLibrary>
 #include <qrkernel/settingsManager.h>
 #include <QsLog.h>
-
-#ifdef Q_OS_WIN
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h> // for SetProcessDPIAware in PlaformInfo::enableHiDPISupport
-#endif
+#include <QOperatingSystemVersion>
 
 using namespace qReal;
 
@@ -129,21 +125,7 @@ void PlatformInfo::enableHiDPISupport()
 			&& !qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR")
 			&& !qEnvironmentVariableIsSet("QT_SCALE_FACTOR")
 			&& !qEnvironmentVariableIsSet("QT_SCREEN_SCALE_FACTORS")) {
-		// Only if there is no attempt to set from the system environment
-#ifdef Q_OS_WIN
-		typedef BOOL (WINAPI *SetProcessDPIAware_t)();
-		// Let Windows decide.
-		if(auto SetProcessDPIAware_ = (SetProcessDPIAware_t)QLibrary::resolve("user32", "SetProcessDPIAware")) {
-			if(SetProcessDPIAware_()) {
-				qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", QByteArray("1"));
-				QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
-			} else {
-				auto err = GetLastError();
-				QLOG_ERROR() << "Failed to SetDpiAware() with error" << err;
-			}
-			return;
-		}
-#endif
-		QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+		// Only if there is no attempt to set from the system environment	
+			QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 	}
 }