From 4ad8621adccf19c9a0f4269f7e72de8b2033926a Mon Sep 17 00:00:00 2001
From: "Jerry (Xinyu Hou)" <xinyu@synergy-project.org>
Date: Fri, 24 Jun 2016 19:05:25 +0100
Subject: [PATCH] #5389 Added qwindows.dll into installer on Windows

---
 src/setup/win32/Include.wxi | 3 ++-
 src/setup/win32/Product.wxs | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/setup/win32/Include.wxi b/src/setup/win32/Include.wxi
index f45ee276..0022c5f5 100644
--- a/src/setup/win32/Include.wxi
+++ b/src/setup/win32/Include.wxi
@@ -9,7 +9,8 @@
   <?define ExtPath="../../../ext" ?>
   <?define QtMajor="5" ?>
   <?define QtPath="C:\Qt\5.6\mingw49_32\bin" ?>
-  
+  <?define QtPlatformPath="C:\Qt\5.6\mingw49_32\plugins\platforms" ?>
+
   <?ifndef Version ?>
   <?define Version="1.0.0" ?>
   <?endif?>
diff --git a/src/setup/win32/Product.wxs b/src/setup/win32/Product.wxs
index e792d78e..9973d8bc 100644
--- a/src/setup/win32/Product.wxs
+++ b/src/setup/win32/Product.wxs
@@ -28,6 +28,7 @@
       <ComponentGroupRef Id="ProductComponents" />
       <ComponentGroupRef Id="OpenSslComponents" />
       <ComponentGroupRef Id="PluginsComponents" />
+      <ComponentGroupRef Id="ProductQtPluginComponents" />
       <MergeRef Id="CRT" />
     </Feature>
 
@@ -71,6 +72,7 @@
           <Merge Id="CRT" Language="0" SourceFile="$(var.CRT)" DiskId="1" />
           <Directory Id="OpenSslDir" Name="OpenSSL" />
           <Directory Id="PluginsDir" Name="Plugins" />
+          <Directory Id="PlatformsDir" Name="Platforms" />
         </Directory>
       </Directory>
       <Directory Id="ProgramMenuFolder" />
@@ -142,6 +144,12 @@
       
     </ComponentGroup>
 
+    <ComponentGroup Id="ProductQtPluginComponents" Directory="PlatformsDir">
+      <Component Id="QtPlatformPlugin" Guid="684EFA14-856B-440E-A5E6-E90E04E36B41">
+      <File Source="$(var.QtPlatformPath)\qwindows.dll" />
+      </Component> 
+    </ComponentGroup>
+
     <ComponentGroup Id="OpenSslComponents" Directory="OpenSslDir">
       <Component Id="OpenSsl" Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1">
         <File Source="$(var.ExtPath)/$(var.OpensslPath)/out32dll/libeay32.dll" Id="OpenSslDll1" />