From a7eaa7caa194e99e44ec8175781e7c6607c45858 Mon Sep 17 00:00:00 2001
From: Jamie Newbon <Jamie@symless.com>
Date: Thu, 7 Nov 2019 12:33:26 +0000
Subject: [PATCH] #6575 Fixed windows theme reverting to very old style

---
 dist/wix/Include.wxi.in |  2 +-
 dist/wix/Product.wxs    | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dist/wix/Include.wxi.in b/dist/wix/Include.wxi.in
index 3cfcd201..e126a26c 100644
--- a/dist/wix/Include.wxi.in
+++ b/dist/wix/Include.wxi.in
@@ -17,7 +17,7 @@
     <?endif ?>
 	<?define QtPath="@QT_PATH@" ?>
     <?define QtBinPath="$(var.QtPath)\bin" ?>
-    <?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>
+    <?define QtPluginsPath="$(var.QtPath)\plugins" ?>
     <?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?>
     <?define OpenSSLBinPath="$(var.OpenSSLPath)\bin" ?>
 </Include>
diff --git a/dist/wix/Product.wxs b/dist/wix/Product.wxs
index deb5ea74..374cee94 100644
--- a/dist/wix/Product.wxs
+++ b/dist/wix/Product.wxs
@@ -13,6 +13,7 @@
 		<Feature Id="ProductFeature" Title="$(var.Name)">
 			<ComponentGroupRef Id="ProductComponents"/>
 			<ComponentGroupRef Id="OpenSSLComponents"/>
+			<ComponentGroupRef Id="ProductQtStylesComponents"/>
 			<ComponentGroupRef Id="ProductQtPluginComponents"/>
 			<ComponentRef Id="RegistryEntries"/>
       <MergeRef Id="VC_Redist"/>
@@ -77,6 +78,7 @@
 				<Directory Id="INSTALLFOLDER" Name="$(var.Name)">
 					<Directory Id="OpenSSLDir" Name="OpenSSL"/>
 					<Directory Id="PlatformsDir" Name="Platforms"/>
+					<Directory Id="QTStylesDir" Name="styles"/>
 				</Directory>
 			</Directory>
 			<Directory Id="ProgramMenuFolder"/>
@@ -130,12 +132,17 @@
 				<?endif ?>
 			</Component>
 		</ComponentGroup>
+		<ComponentGroup Directory="QTStylesDir" Id="ProductQtStylesComponents">
+      <Component Guid="96E0F8D8-64FD-4CE8-94D1-F6EDCBBB4995" Id="Styles">
+        <File Id="qwindowsvistastyle" Source="$(var.QtPluginsPath)\styles\qwindowsvistastyle.dll"/>
+      </Component>
+		</ComponentGroup>
 		<ComponentGroup Directory="PlatformsDir" Id="ProductQtPluginComponents">
 			<Component Guid="684EFA14-856B-440E-A5E6-E90E04E36B41" Id="QtPlatformPlugin">
 				<?if $(var.Configuration) = "Debug" ?>
-				<File Source="$(var.QtPlatformPath)\qwindowsd.dll"/>
+				<File Source="$(var.QtPluginsPath)\platforms\qwindowsd.dll"/>
 				<?else ?>
-				<File Source="$(var.QtPlatformPath)\qwindows.dll"/>
+				<File Source="$(var.QtPluginsPath)\platforms\qwindows.dll"/>
 				<?endif ?>
 			</Component>
 		</ComponentGroup>