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

install x86 vcredist only if it is necessary

Browse Source 
Change-Id: I7d3b3aa35ceef3502c6b4250b60a572631a117be
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Tim Jenssen
2013-11-12 18:02:33 +01:00
parent 9e2caea36f
commit 62fed3c407
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,7 +157,14 @@ Component.prototype.createOperations = function()
component.qtCreatorBinaryPath, component.qtCreatorBinaryPath,
"@StartMenuDir@/Qt Creator.lnk", "@StartMenuDir@/Qt Creator.lnk",
"workingDirectory=@homeDir@" ); "workingDirectory=@homeDir@" );
component.addElevatedOperation("Execute", "{0,3010,1638}", "@TargetDir@\\lib\\vcredist_msvc2010\\vcredist_x86.exe", "/norestart", "/q");
// 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\\x86\\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,1638,3010,5100}", "@TargetDir@\\lib\\vcredist_msvc2010\\vcredist_x86.exe", "/norestart", "/q");
}
registerWindowsFileTypeExtensions(); registerWindowsFileTypeExtensions();
if (component.userInterface("AssociateCommonFiletypesForm").AssociateCommonFiletypesCheckBox if (component.userInterface("AssociateCommonFiletypesForm").AssociateCommonFiletypesCheckBox