From ca36a49711fd1fb1cc9cca3d09fae3f0645f2c0c Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Wed, 4 May 2011 21:49:20 +0300
Subject: [PATCH] Installer: Remove unneeded Qt DLLs.

Since we now have on-line help we don't need to install the DLLs that
were required for the help viewer.
---
 win_installer/cppcheck.wxs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index ed4e5098c..5ef889767 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -31,12 +31,8 @@
                   WorkingDirectory='INSTALLDIR' Icon="cppcheckgui.exe" IconIndex="0" Advertise="yes" />
             </File>
             <!-- <File Id='mingwm10dll' Name='mingwm10.dll' Source='mingwm10.dll' /> -->
-            <File Id='qtclucene4dll' Name='qtclucene4.dll' Source='$(var.QtDllDir)\qtclucene4.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='qthelp4dll' Name='qthelp4.dll' Source='$(var.QtDllDir)\qthelp4.dll' />
-            <File Id='qtnetwork4dll' Name='qtnetwork4.dll' Source='$(var.QtDllDir)\qtnetwork4.dll' />
-            <File Id='qtsql4dll' Name='qtsql4.dll' Source='$(var.QtDllDir)\qtsql4.dll' />
             <File Id='qtxml4dll' Name='qtxml4.dll' Source='$(var.QtDllDir)\qtxml4.dll' />
           </Component>
           <Component Id='GuiTranslations' Guid='$(var.guiTranslationsGUID)'>
@@ -61,6 +57,7 @@
                Also remove old gui.exe which is now cppcheck-gui.exe.
                Remove old Swedish translation file which was renamed.
                Remove locally installed help file that didn't work.
+               Remove Qt DLLs not needed anymore
           -->
           <Component Id='InnoSetupCleanup' Guid='4A3F299D-1EE1-468b-814B-D6577F0698CA'>
             <RemoveFile Id="msvcp90.dll" On="install" Name="msvcp90.dll" />
@@ -69,6 +66,10 @@
             <RemoveFile Id="gui.exe" On="install" Name="gui.exe" />
             <RemoveFile Id="cppcheck_se.qm" On="install" Name="cppcheck_se.qm" />
             <RemoveFile Id="onlinehelp.qhc" On="install" Name="onlinehelp.qhc" />
+            <RemoveFile Id="qtclucene4dll" On="install" Name="qtclucene4.dll" />
+            <RemoveFile Id="qthelp4dll" On="install" Name="qthelp4.dll" />
+            <RemoveFile Id="qtnetwork4dll" On="install" Name="qtnetwork4.dll" />
+            <RemoveFile Id="qtsql4dll" On="install" Name="qtsql4.dll" />
           </Component>
         </Directory>
         <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" />