From fc20b5e237a9ef4fb1c408ab682810dcc6d90515 Mon Sep 17 00:00:00 2001
From: walker0643 <unknown>
Date: Fri, 9 Feb 2018 20:51:57 -0500
Subject: [PATCH] #6529 Removed debug elements from MSI config (this could
 break debug installers... maybe?)

---
 dist/wix/Include.wxi.in | 4 ----
 dist/wix/Product.wxs    | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/dist/wix/Include.wxi.in b/dist/wix/Include.wxi.in
index a42b0426..c0391c7c 100644
--- a/dist/wix/Include.wxi.in
+++ b/dist/wix/Include.wxi.in
@@ -22,8 +22,4 @@
     <?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>
     <?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?>
     <?define OpenSSLBinPath="$(var.OpenSSLPath)\bin" ?>
-    <?if $(var.Configuration) = "Debug" ?>
-        <?define DebugCRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_DebugCRT_$(var.Platform).msm" ?>
-    <?endif ?>
-    <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
 </Include>
diff --git a/dist/wix/Product.wxs b/dist/wix/Product.wxs
index b6f91dd4..baf3049e 100644
--- a/dist/wix/Product.wxs
+++ b/dist/wix/Product.wxs
@@ -14,10 +14,6 @@
 			<ComponentGroupRef Id="ProductComponents"/>
 			<ComponentGroupRef Id="OpenSSLComponents"/>
 			<ComponentGroupRef Id="ProductQtPluginComponents"/>
-			<MergeRef Id="CRT"/>
-            <?if $(var.Configuration) = "Debug" ?>
-			    <MergeRef Id="DebugCRT"/>
-	        <?endif ?>
 			<ComponentRef Id="RegistryEntries"/>
 		</Feature>
 		<DirectoryRef Id="TARGETDIR">
@@ -73,10 +69,6 @@
 		<Directory Id="TARGETDIR" Name="SourceDir">
 			<Directory Id="$(var.ProgramFilesFolder)">
 				<Directory Id="INSTALLFOLDER" Name="$(var.Name)">
-					<Merge DiskId="1" Id="CRT" Language="0" SourceFile="$(var.CRT)"/>
-					<?if $(var.Configuration) = "Debug" ?>
-					    <Merge DiskId="1" Id="DebugCRT" Language="0" SourceFile="$(var.DebugCRT)"/>
-				    <?endif ?>
 					<Directory Id="OpenSSLDir" Name="OpenSSL"/>
 					<Directory Id="PlatformsDir" Name="Platforms"/>
 				</Directory>