From 31c3a05f9aae405e4e2b571fc34e092020fed572 Mon Sep 17 00:00:00 2001
From: Karim ElDeeb <keldeeb@gmail.com>
Date: Sat, 20 Oct 2018 11:30:56 +0200
Subject: [PATCH] Fix Windows Vista style when using Qt 5.10 and up

Since Qt 5.10, the Windows Vista style has been moved to its own plugin. This plugin must be included in order to show the new style. It will be included for the 64-bit build only for now, since we are using a different Qt version (5.7) for the 32-bit build.

See #1580.
---
 installer/windows/product.wxs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/installer/windows/product.wxs b/installer/windows/product.wxs
index 76ad57c7..9139619d 100644
--- a/installer/windows/product.wxs
+++ b/installer/windows/product.wxs
@@ -50,6 +50,18 @@
             <Merge Id="VCRedist" SourceFile="$(var.VCRedistPath)\$(var.VCRedistFile)" DiskId="1" Language="0" />
             <Directory Id="$(var.ProgramFilesFolder)">
                 <Directory Id="INSTALLDIR" Name="$(var.Name)">
+                    <!--
+                    This DLL is required when using Qt 5.10 and higher to show Windows Vista style GUI. The check for
+                    64-bit is required here since we are using Qt 5.7 for the 32-bit build. This file does not exist
+                    on earlier version of Qt. If Qt 5.10 is used for both 32-bit and 64-bit then this check can be removed.
+
+                    See https://bugreports.qt.io/browse/QTBUG-65177
+                    -->
+                    <?if $(sys.BUILDARCH)="x64"?>
+                    <Directory Id="styles" Name="styles">
+                        <Component><File Source="$(var.QtPath)\plugins\styles\qwindowsvistastyle.dll" /></Component>
+                    </Directory>
+                    <?endif?>
                     <Directory Id="imageformats" Name="imageformats">
                         <Component><File Source="$(var.QtPath)\plugins\imageformats\qgif.dll" /></Component>
                         <Component><File Source="$(var.QtPath)\plugins\imageformats\qicns.dll" /></Component>
@@ -131,6 +143,10 @@
             <ComponentRef Id="qwebp.dll" />
             <!-- Platforms -->
             <ComponentRef Id="qwindows.dll" />
+            <!-- Windows Vista Style -->
+            <?if $(sys.BUILDARCH)="x64"?>
+                <ComponentRef Id="qwindowsvistastyle.dll" />
+            <?endif?>
             <!-- Printer -->
             <ComponentRef Id="windowsprintersupport.dll" />
             <!-- Licenses -->