remove redistributable magic (that doesn't work) from installer and
re-add qwindows.dll
This commit is contained in:
parent
2ffd92accc
commit
3023f9b469
|
@ -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.ProgramFiles)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.11.25325\Merge Modules\Microsoft_VC141_DebugCRT_$(var.Platform).msm" ?>
|
|
||||||
<?endif ?>
|
|
||||||
<?define CRT="$(env.ProgramFiles)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.11.25325\MergeModules\Microsoft_VC141_CRT_$(var.Platform).msm" ?>
|
|
||||||
</Include>
|
</Include>
|
||||||
|
|
|
@ -12,10 +12,7 @@
|
||||||
</Upgrade>
|
</Upgrade>
|
||||||
<Feature Id="ProductFeature" Title="$(var.Name)">
|
<Feature Id="ProductFeature" Title="$(var.Name)">
|
||||||
<ComponentGroupRef Id="ProductComponents"/>
|
<ComponentGroupRef Id="ProductComponents"/>
|
||||||
<MergeRef Id="CRT"/>
|
<ComponentGroupRef Id="ProductQtPluginComponents"/>
|
||||||
<?if $(var.Configuration) = "Debug" ?>
|
|
||||||
<MergeRef Id="DebugCRT"/>
|
|
||||||
<?endif ?>
|
|
||||||
<ComponentRef Id="RegistryEntries"/>
|
<ComponentRef Id="RegistryEntries"/>
|
||||||
</Feature>
|
</Feature>
|
||||||
<DirectoryRef Id="TARGETDIR">
|
<DirectoryRef Id="TARGETDIR">
|
||||||
|
@ -50,10 +47,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>
|
||||||
|
@ -106,5 +99,14 @@
|
||||||
<?endif ?>
|
<?endif ?>
|
||||||
</Component>
|
</Component>
|
||||||
</ComponentGroup>
|
</ComponentGroup>
|
||||||
|
<ComponentGroup Directory="PlatformsDir" Id="ProductQtPluginComponents">
|
||||||
|
<Component Guid="684EFA14-856B-440E-A5E6-E90E04E36B41" Id="QtPlatformPlugin">
|
||||||
|
<?if $(var.Configuration) = "Debug" ?>
|
||||||
|
<File Source="$(var.QtPlatformPath)\qwindowsd.dll"/>
|
||||||
|
<?else ?>
|
||||||
|
<File Source="$(var.QtPlatformPath)\qwindows.dll"/>
|
||||||
|
<?endif ?>
|
||||||
|
</Component>
|
||||||
|
</ComponentGroup>
|
||||||
</Fragment>
|
</Fragment>
|
||||||
</Wix>
|
</Wix>
|
||||||
|
|
Loading…
Reference in New Issue