diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-11-12 18:02:33 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-12-03 10:36:51 +0100 |
| commit | 62fed3c4071622abd3aad1b2bfb4a97df29eb37c (patch) | |
| tree | 7738c75ea6b7c5b37d92cd94ba846982d08a003e /dist | |
| parent | 9e2caea36f2a69a7cafc5f34d0ebb87ade78d254 (diff) | |
| download | qt-creator-62fed3c4071622abd3aad1b2bfb4a97df29eb37c.tar.gz | |
install x86 vcredist only if it is necessary
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>
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs | 9 |
1 files changed, 8 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 5705d5a6f1..3b8c7e5c5c 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 @@ -157,7 +157,14 @@ Component.prototype.createOperations = function() component.qtCreatorBinaryPath, "@StartMenuDir@/Qt Creator.lnk", "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(); if (component.userInterface("AssociateCommonFiletypesForm").AssociateCommonFiletypesCheckBox |