From fc5857f0d86fd6ec0fda12f3d6f533f6fad5d216 Mon Sep 17 00:00:00 2001
From: Mike Gelfand <mikedld@mikedld.com>
Date: Wed, 19 Jun 2019 08:19:51 +0300
Subject: [PATCH] Include Windows Vista Qt style, remove dbus revision suffix
 and expat (MSI package)

---
 dist/msi/components/QtClient.wxs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dist/msi/components/QtClient.wxs b/dist/msi/components/QtClient.wxs
index 383faeeaf..b4d12a17a 100644
--- a/dist/msi/components/QtClient.wxs
+++ b/dist/msi/components/QtClient.wxs
@@ -113,14 +113,17 @@
         </Component>
       </Directory>
 
+      <Directory Id="QTSTYLESDIR" Name="styles">
+        <Component Id="dll.qt5.plugins.styles.windowsvista">
+          <File DiskId="1" KeyPath="yes" Name="qwindowsvistastyle.dll" />
+        </Component>
+      </Directory>
+
     </DirectoryRef>
     <DirectoryRef Id="INSTALLDIR" FileSource="$(var.ThirdPartyDir)\bin">
 
       <Component Id="dll.dbus">
-        <File DiskId="1" KeyPath="yes" Name="dbus-1-3.dll" />
-      </Component>
-      <Component Id="dll.expat">
-        <File DiskId="1" KeyPath="yes" Name="expat.dll" />
+        <File DiskId="1" KeyPath="yes" Name="dbus-1.dll" />
       </Component>
 
     </DirectoryRef>
@@ -137,8 +140,8 @@
       <ComponentRef Id="dll.qt5.widgets" />
       <ComponentRef Id="dll.qt5.winextras" />
       <ComponentRef Id="dll.qt5.plugins.platforms.windows" />
+      <ComponentRef Id="dll.qt5.plugins.styles.windowsvista" />
       <ComponentRef Id="dll.dbus" />
-      <ComponentRef Id="dll.expat" />
       <ComponentGroupRef Id="QtClientTranslationsComponents" />
       <ComponentGroupRef Id="QtTranslationsComponents" />
     </ComponentGroup>