From 9b093b404c2f090250fd1e91d42abbe3da19d4f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sun, 30 Sep 2012 09:38:03 +0200
Subject: [PATCH] Revert "installer: remove useless define"

This reverts commit 88c55621afa8ed472e8759467177a3cbb3e35735.
---
 win_installer/config.wxi   | 1 +
 win_installer/cppcheck.wxs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/win_installer/config.wxi b/win_installer/config.wxi
index e3b405a40..c3f1934f5 100644
--- a/win_installer/config.wxi
+++ b/win_installer/config.wxi
@@ -9,4 +9,5 @@
   <?define TranslationsDir = "..\gui" ?>
   <?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 3cca26d3f..d1b798256 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -74,6 +74,7 @@
             <RemoveFile Id="qtsql4dll" On="install" Name="qtsql4.dll" />
           </Component>
         </Directory>
+        <!-- <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" /> -->
       </Directory>
 
       <Directory Id='ProgramMenuFolder' Name='Programs' >