From a03fcc0f53932ef60ad3a458e46161ffed91678b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Wed, 22 Jul 2020 09:14:51 +0200
Subject: [PATCH] win_installer: try to fix build error

---
 win_installer/cppcheck.wxs    | 8 ++------
 win_installer/productInfo.wxi | 1 -
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 8ed3271c2..eb3b5cedc 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -37,6 +37,8 @@
               <Shortcut Id='startmenuGui' Directory="ProgramMenuDir" Name='$(var.ProductNameShort)'
                   WorkingDirectory='INSTALLDIR' Icon="cppcheckgui.exe" IconIndex="0" Advertise="yes" />
             </File>
+            <File Id='onlinehelpqhc' Name='online-help.qhc' Source='$(var.GuiHelpDir)\online-help.qhc' />
+            <File Id='onlinehelpqch' Name='online-help.qch' Source='$(var.GuiHelpDir)\online-help.qch' />
             <File Id='Qt5Coredll' Name='Qt5Core.dll' Source='$(var.QtDllDir)\Qt5Core.dll' />
             <File Id='Qt5Guidll' Name='Qt5Gui.dll' Source='$(var.QtDllDir)\Qt5Gui.dll' />
             <File Id='Qt5Widgetsdll' Name='Qt5Widgets.dll' Source='$(var.QtDllDir)\Qt5Widgets.dll' />
@@ -55,12 +57,6 @@
               <File Id='qwindowsvistastyledll' Name='qwindowsvistastyle.dll' Source='$(var.QtDllDir)\styles\qwindowsvistastyle.dll' />
             </Component>
           </Directory>
-          <Directory Id='GuiHelpFolder' Name='help'>
-            <Component Id='GuiHelp' DiskId='1' Guid='$(var.guihelpGUID)'>
-              <File Id='onlinehelpqhc' Name='online-help.qhc' Source='$(var.GuiHelpDir)\online-help.qhc' />
-              <File Id='onlinehelpqch' Name='online-help.qch' Source='$(var.GuiHelpDir)\online-help.qch' />
-            </Component>
-          </Directory>
           <Directory Id='TranslationsFolder' Name='lang'>
             <Component Id='GuiTranslations' Guid='$(var.guiTranslationsGUID)'>
               <File Id='cppcheck_de.qm' Name='cppcheck_de.qm' Source='$(var.TranslationsDir)\cppcheck_de.qm' />
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index 817f46048..7c910c35e 100644
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -21,5 +21,4 @@
   <?define optionalPtfsGUID = "F9EB9DB1-C0F1-4548-A5B0-27B51CD43A34" ?>
   <?define basedocsGUID = "9F62B23C-CD2B-4826-A567-6AB6F75A2AEA" ?>
   <?define registrykeysGUID = "8CB515B1-6EF6-4A2A-97A0-F8A13E3A505E" ?>
-  <?define guihelpGUID = "0A0C93BF-59E8-4919-B08F-D4BA63B9C93C" ?>
 </Include>