feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Installer: Suppress error if newer version of vcredist is already installed

Browse Source 
Task-number: QTCREATORBUG-8076

Change-Id: Ia39491569fe696ec27c8375251ce6a0d5923dc1e
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Eike Ziller
2012-10-18 11:28:49 +02:00
parent 2f3730ca47
commit c89ffbe3ce
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs vendored
View File

@@ -121,7 +121,7 @@ Component.prototype.createOperations = function()
"@TargetDir@\\bin\\qtcreator.exe", "@TargetDir@\\bin\\qtcreator.exe",
"@StartMenuDir@/Qt Creator.lnk", "@StartMenuDir@/Qt Creator.lnk",
"workingDirectory=@homeDir@" ); "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(); registerWindowsFileTypeExtensions();
} }
if ( installer.value("os") == "x11" ) if ( installer.value("os") == "x11" )