diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-18 11:28:49 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-18 13:16:36 +0200 |
| commit | c89ffbe3ce6243fa98820923ada46e5c2572805a (patch) | |
| tree | f49a3e63ccea64d3b7db91987aeb6ebdd89843f6 /dist/installer | |
| parent | 2f3730ca4762b885605584c7eaba6102cb69e068 (diff) | |
Installer: Suppress error if newer version of vcredist is already installed
Task-number: QTCREATORBUG-8076
Change-Id: Ia39491569fe696ec27c8375251ce6a0d5923dc1e
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'dist/installer')
| -rw-r--r-- | dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs index a9bd1debda..f3077e52f9 100644 --- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs +++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs @@ -121,7 +121,7 @@ Component.prototype.createOperations = function() "@TargetDir@\\bin\\qtcreator.exe", "@StartMenuDir@/Qt Creator.lnk", "workingDirectory=@homeDir@" ); - component.addElevatedOperation("Execute", "{0,3010}", "@TargetDir@\\lib\\vcredist_msvc2010\\vcredist_x86.exe", "/norestart", "/q"); + component.addElevatedOperation("Execute", "{0,3010,1638}", "@TargetDir@\\lib\\vcredist_msvc2010\\vcredist_x86.exe", "/norestart", "/q"); registerWindowsFileTypeExtensions(); } if ( installer.value("os") == "x11" ) |