From a969a1aa9a1535b43f283b0f2ebd0f031081569c Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Sun, 17 Jan 2010 01:09:14 +0200
Subject: [PATCH] Installer: Add variable for Qt dll location.

---
 win_installer/cppcheck.wxs    | 6 +++---
 win_installer/productInfo.wxi | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 7e30b4af2..37835d921 100755
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -24,9 +24,9 @@
                   WorkingDirectory='INSTALLDIR' Icon="gui.exe" IconIndex="0" Advertise="yes" />
             </File>
             <!-- <File Id='mingwm10dll' Name='mingwm10.dll' Source='mingwm10.dll' /> -->
-            <File Id='qtcore4dll' Name='qtcore4.dll' Source='qtcore4.dll' />
-            <File Id='qtgui4dll' Name='qtgui4.dll' Source='qtgui4.dll' />
-            <File Id='qtxml4dll' Name='qtxml4.dll' Source='qtxml4.dll' />
+            <File Id='qtcore4dll' Name='qtcore4.dll' Source='$(var.QtDllDir)\qtcore4.dll' />
+            <File Id='qtgui4dll' Name='qtgui4.dll' Source='$(var.QtDllDir)\qtgui4.dll' />
+            <File Id='qtxml4dll' Name='qtxml4.dll' Source='$(var.QtDllDir)\qtxml4.dll' />
           </Component>
           <Component Id='authors.txt' Guid='*'>
             <File Id='authors.txt' Name='authors.txt' DiskId='1' Source='..\authors' KeyPath='yes' />
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index 5277095a2..ad15f6ac5 100755
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -14,5 +14,6 @@
 
   <?define CliBuildDir = "..\cli\release" ?>
   <?define GuiBuildDir = "..\gui\release" ?>
+  <?define QtDllDir = "..\..\runtimes" ?>
   <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86.msm" ?>
 </Include>