From c89ffbe3ce6243fa98820923ada46e5c2572805a Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 18 Oct 2012 11:28:49 +0200 Subject: [PATCH] Installer: Suppress error if newer version of vcredist is already installed Task-number: QTCREATORBUG-8076 Change-Id: Ia39491569fe696ec27c8375251ce6a0d5923dc1e Reviewed-by: Karsten Heimrich Reviewed-by: Tim Jenssen --- .../org.qtproject.qtcreator.application/meta/installscript.qs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a9bd1debda0..f3077e52f97 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" )