Mercurial > hg > easyhg

diff deploy/win32/easyhg.wxs @ 696:6a3d38b7f672

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Proper locations for platform + style plugins
author Chris Cannam
date Mon, 10 Dec 2018 16:02:49 +0000
parents b939bdac0643
children 7942b7633505
line wrap: on
line diff
--- a/deploy/win32/easyhg.wxs	Mon Dec 10 15:26:04 2018 +0000
+++ b/deploy/win32/easyhg.wxs	Mon Dec 10 16:02:49 2018 +0000
@@ -160,23 +160,37 @@
                   Name="Qt5PrintSupport.dll"
                   DiskId="1"
                   Source="Qt5PrintSupport.dll"/>
-              <File
-                  Id="qminimal"
-                  Name="qminimal.dll"
-                  DiskId="1"
-                  Source="qminimal.dll"/>
-              <File
-                  Id="qwindows"
-                  Name="qwindows.dll"
-                  DiskId="1"
-                  Source="qwindows.dll"/>
-              <File
-                  Id="qwindowsvistastyle"
-                  Name="qwindowsvistastyle.dll"
-                  DiskId="1"
-                  Source="qwindowsvistastyle.dll"/>
             </Component>
 
+            <Directory Id="qtplatforms" Name="platforms">
+              <Component
+                  Id="qtplatforms"
+                  Guid="1b491383-3164-4af5-9091-0598cd5864fa">
+                <File
+                    Id="qminimal"
+                    Name="qminimal.dll"
+                    DiskId="1"
+                    Source="qminimal.dll"/>
+                <File
+                    Id="qwindows"
+                    Name="qwindows.dll"
+                    DiskId="1"
+                    Source="qwindows.dll"/>
+              </Component>
+            </Directory>
+            
+            <Directory Id="qtstyles" Name="styles">
+              <Component
+                  Id="qtstyles"
+                  Guid="883a14e7-ecb5-4349-a3f0-008392750d91">
+                <File
+                    Id="qwindowsvistastyle"
+                    Name="qwindowsvistastyle.dll"
+                    DiskId="1"
+                    Source="qwindowsvistastyle.dll"/>
+              </Component>
+            </Directory>
+
             <Component
                 Id="hgexec"
                 Guid="5BBC4080-2EDF-4616-A8CB-F96B9C942C1A">
@@ -429,6 +443,8 @@
       <ComponentRef Id="VCLIBS90"/>
       <ComponentRef Id="HelperScripts"/>
       <ComponentRef Id="Qt5"/>
+      <ComponentRef Id="qtplatforms"/>
+      <ComponentRef Id="qtstyles"/>
       <ComponentRef Id="pyqtlibs"/>
       <ComponentRef Id="pyenum"/>
       <ComponentRef Id="hgexec"/>