diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-03-18 08:05:22 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-03-18 08:48:38 +0000 |
| commit | 3f0e750d18885b4931ca4a75b534bfdbb6ee858d (patch) | |
| tree | ea8980bd7a42bcc461ee8c461d06be3b49bdf72d /packaging-tools/configurations | |
| parent | 159df69c924ef1cb7363d6b9f17945313eaa1b7f (diff) | |
Check whether vcredist x64 is already installed
like it is done for the x86 vcredist package
Fixes: QTCREATORBUG-23116
Change-Id: Ibc616be8b0c9d99c8039e1d1bf573341d91bb50a
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'packaging-tools/configurations')
2 files changed, 9 insertions, 4 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_64/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_64/meta/installscript.qs index f78d92a61..be837ff02 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_64/meta/installscript.qs +++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_64/meta/installscript.qs @@ -42,6 +42,9 @@ // constructor function Component() { + // only install c runtime if it is needed, no minor version check of the c runtime till we need it + if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\VC\\VCRedist\\x64\\Installed") != 1) + component.setValue("RequiresAdminRights", "true"); } Component.prototype.createOperations = function() @@ -50,7 +53,9 @@ Component.prototype.createOperations = function() // so that the simulator finds its fonts and applications find the simulator component.createOperations(); - //return value 3010 means it need a reboot, but in most cases it is not needed for run Qt application - // return value 5100 means there's a newer version of the runtime already installed - component.addElevatedOperation("Execute", "{0,3010,1638,5100}", "@TargetDir@\\vcredist\\vcredist_x64.exe", "/norestart", "/q"); + if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\VC\\VCRedist\\x64\\Installed") != 1) { + // return value 3010 means it need a reboot, but in most cases it is not needed for run Qt application + // return value 5100 means there's a newer version of the runtime already installed + component.addElevatedOperation("Execute", "{0,3010,1638,5100}", "@TargetDir@\\vcredist\\vcredist_x64.exe", "/norestart", "/q"); + } } diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_64/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_64/meta/package.xml index b5d58c2cb..09a8198ee 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_64/meta/package.xml +++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.vcredist_64/meta/package.xml @@ -2,7 +2,7 @@ <Package> <DisplayName>VCRedist for MSVC 64bit</DisplayName> <Description>Needed by all included Qt applications.</Description> - <Version>2019-10-29</Version> + <Version>2020-03-18</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Script>installscript.qs</Script> <Virtual>true</Virtual> |