#6529 Removed debug elements from MSI config (this could break debug installers... maybe?)
This commit is contained in:
parent
70a26763a5
commit
fc20b5e237
|
@ -22,8 +22,4 @@
|
||||||
<?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>
|
<?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>
|
||||||
<?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?>
|
<?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?>
|
||||||
<?define OpenSSLBinPath="$(var.OpenSSLPath)\bin" ?>
|
<?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>
|
</Include>
|
||||||
|
|
|
@ -14,10 +14,6 @@
|
||||||
<ComponentGroupRef Id="ProductComponents"/>
|
<ComponentGroupRef Id="ProductComponents"/>
|
||||||
<ComponentGroupRef Id="OpenSSLComponents"/>
|
<ComponentGroupRef Id="OpenSSLComponents"/>
|
||||||
<ComponentGroupRef Id="ProductQtPluginComponents"/>
|
<ComponentGroupRef Id="ProductQtPluginComponents"/>
|
||||||
<MergeRef Id="CRT"/>
|
|
||||||
<?if $(var.Configuration) = "Debug" ?>
|
|
||||||
<MergeRef Id="DebugCRT"/>
|
|
||||||
<?endif ?>
|
|
||||||
<ComponentRef Id="RegistryEntries"/>
|
<ComponentRef Id="RegistryEntries"/>
|
||||||
</Feature>
|
</Feature>
|
||||||
<DirectoryRef Id="TARGETDIR">
|
<DirectoryRef Id="TARGETDIR">
|
||||||
|
@ -73,10 +69,6 @@
|
||||||
<Directory Id="TARGETDIR" Name="SourceDir">
|
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||||
<Directory Id="$(var.ProgramFilesFolder)">
|
<Directory Id="$(var.ProgramFilesFolder)">
|
||||||
<Directory Id="INSTALLFOLDER" Name="$(var.Name)">
|
<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="OpenSSLDir" Name="OpenSSL"/>
|
||||||
<Directory Id="PlatformsDir" Name="Platforms"/>
|
<Directory Id="PlatformsDir" Name="Platforms"/>
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
Loading…
Reference in New Issue