From e19d0f18c79110898c5e8b67087241c0e5be5a81 Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Sun, 5 Sep 2010 13:40:16 +0300
Subject: [PATCH] Installer: Install new Qt-help help file.

---
 win_installer/config.wxi   | 2 +-
 win_installer/cppcheck.wxs | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/win_installer/config.wxi b/win_installer/config.wxi
index 32303086a..23a3a3014 100644
--- a/win_installer/config.wxi
+++ b/win_installer/config.wxi
@@ -6,7 +6,7 @@
 
   <?define CliBuildDir = "..\Build\release" ?>
   <?define GuiBuildDir = "..\Build\gui" ?>
-  <?define ManualDir = "..\man" ?>
+  <?define HelpDir = "..\gui\help" ?>
   <?define QtDllDir = "..\..\runtimes" ?>
   <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86.msm" ?>
 </Include>
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index e141cb868..d5e4214af 100755
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -48,10 +48,8 @@
           <Component Id='readme.txt' Guid='*'>
             <File Id='readme.txt' Name='readme.txt' DiskId='1' Source='..\readme.txt' KeyPath='yes' />
           </Component>
-          <Component Id='HtmlHelp' Guid='*'>
-            <File Id='cppcheck.chm' Name='cppcheck.chm' DiskId='1' Source='$(var.ManualDir)\cppcheck.chm' KeyPath='yes'>
-              <Shortcut Id='startmenuManual' Directory="ProgramMenuDir" Name="Manual" Advertise="yes" />
-            </File>
+          <Component Id='GuiHelp' Guid='*'>
+            <File Id='online-help.qhc' Name='online-help.qhc' DiskId='1' Source='$(var.HelpDir)\online-help.qhc' KeyPath='yes' />
           </Component>
           <!-- Cleanup runtime files installed by previous InnoSetup installer -->
           <Component Id='InnoSetupCleanup' Guid='4A3F299D-1EE1-468b-814B-D6577F0698CA'>
@@ -80,7 +78,7 @@
         <ComponentRef Id='gui.exe' />
         <ComponentRef Id='authors.txt' />
         <ComponentRef Id='readme.txt' />
-        <ComponentRef Id='HtmlHelp' />
+        <ComponentRef Id='GuiHelp' />
         <ComponentRef Id='ProgramMenuDir' />
         <ComponentRef Id='InnoSetupCleanup' />
       </Feature>