Mercurial > hg > sonic-visualiser

changeset 558:6584788f82b8 with-dependencies

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Mon, 13 May 2013 11:10:03 +0100
parents e82080cf7da8 (current diff) aad6a158fb4b (diff)
children 881a3f0dd268
files
diffstat 1 files changed, 18 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/deploy/win32/sonic-visualiser.wxs	Fri May 10 14:30:51 2013 +0100
+++ b/deploy/win32/sonic-visualiser.wxs	Mon May 13 11:10:03 2013 +0100
@@ -167,18 +167,25 @@
                   Name="libwinpthread-1.dll"
                   DiskId="1"
                   Source="release\libwinpthread-1.dll"/>
-              <File
-                  Id="qminimal"
-                  Name="qminimal.dll"
-                  DiskId="1"
-                  Source="release\qminimal.dll"/>
-              <File
-                  Id="qwindows"
-                  Name="qwindows.dll"
-                  DiskId="1"
-                  Source="release\qwindows.dll"/>
             </Component>
 	    
+	    <Directory Id="Platforms" Name="platforms">
+              <Component
+                  Id="Qt5PlatformPlugins"
+                  Guid="1EDCEA4B-C83F-430B-B09D-CB113DFD4E77">
+		<File
+                    Id="qminimal"
+                    Name="qminimal.dll"
+                    DiskId="1"
+                    Source="release\qminimal.dll"/>
+		<File
+                    Id="qwindows"
+                    Name="qwindows.dll"
+                    DiskId="1"
+                    Source="release\qwindows.dll"/>
+              </Component>
+	    </Directory>
+
         </Directory>
       </Directory>
       
@@ -199,6 +206,7 @@
       <ComponentRef Id="VampPlugins"/>
       <ComponentRef Id="MainExecutable"/>
       <ComponentRef Id="Qt5"/>
+      <ComponentRef Id="Qt5PlatformPlugins"/>
       <ComponentRef Id="ProgramMenuDir"/>
     </Feature>