From 9b87ca38079faa41e740cf1483e45cec43d97665 Mon Sep 17 00:00:00 2001
From: Tom Sparrow <sparrowt@gmail.com>
Date: Fri, 8 May 2015 00:48:04 +0100
Subject: [PATCH] Fix missing DLLs after install #3774

The CompanionFile attribute was causing the installer to be confused:
 Won't Overwrite; Won't patch; Existing file is unversioned but modified
and hence not install a bunch of these DLLs in some cases.
---
 src/setup/win32/Product.wxs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/setup/win32/Product.wxs b/src/setup/win32/Product.wxs
index c93b4db6..673c85aa 100644
--- a/src/setup/win32/Product.wxs
+++ b/src/setup/win32/Product.wxs
@@ -110,13 +110,13 @@
           <fire:FirewallException Id="GuiFirewallException" Name="$(var.Name)" Scope="any" IgnoreFailure="yes" />
         </File>
 
-        <File Source="$(var.QtPath)\libgcc_s_dw2-1.dll" CompanionFile="GuiProgram" />
-        <File Source="$(var.QtPath)\mingwm10.dll" CompanionFile="GuiProgram" />
-        <File Source="$(var.QtPath)\QtCore4.dll" CompanionFile="GuiProgram" />
-        <File Source="$(var.QtPath)\QtGui4.dll" CompanionFile="GuiProgram" />
-        <File Source="$(var.QtPath)\QtNetwork4.dll" CompanionFile="GuiProgram" />
+        <File Source="$(var.QtPath)\libgcc_s_dw2-1.dll" />
+        <File Source="$(var.QtPath)\mingwm10.dll" />
+        <File Source="$(var.QtPath)\QtCore4.dll" />
+        <File Source="$(var.QtPath)\QtGui4.dll" />
+        <File Source="$(var.QtPath)\QtNetwork4.dll" />
         
-        <File Source="$(var.ExtPath)\bonjour\x64\dnssd.dll" CompanionFile="GuiProgram" />
+        <File Source="$(var.ExtPath)\bonjour\x64\dnssd.dll" />
 
       </Component>