diff options
| author | David Schulz <david.schulz@qt.io> | 2019-06-27 12:22:23 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2019-07-18 08:36:00 +0000 |
| commit | 22fe30f29d2db1f059565fc3b62fef90386bfeac (patch) | |
| tree | db0d00f70062c5c70c7b9214e6f1652839426280 /packaging-tools/configurations | |
| parent | e8960917eb460b2c34df8d246b1465f86c61bb0f (diff) | |
Windows debugger: ignore msi error ERROR_INSTALL_ALREADY_RUNNING
These occur if there is already an msi installation running. Since the
debugging tools are not crucial for Qt Creator just ignore this error.
Change-Id: I3a300a1addca8a997911f6df226cf860bd0f8777
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'packaging-tools/configurations')
| -rw-r--r-- | packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.windows_kits_debuggers/meta/installscript.qs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.windows_kits_debuggers/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.windows_kits_debuggers/meta/installscript.qs index c3bb527d9..192658eb0 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.windows_kits_debuggers/meta/installscript.qs +++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.windows_kits_debuggers/meta/installscript.qs @@ -64,7 +64,7 @@ Component.prototype.createOperations = function() component.createOperations(); if (checkx64DebuggerVersion()) - component.addElevatedOperation("Execute", "{0,3010,1638,5100}", "msiexec", "/i", "@TargetDir@\\vcredist\\X64 Debuggers And Tools-x64_en-us.msi", "/norestart", "/q"); + component.addElevatedOperation("Execute", "{0,3010,1638,1618,5100}", "msiexec", "/i", "@TargetDir@\\vcredist\\X64 Debuggers And Tools-x64_en-us.msi", "/norestart", "/q"); if (checkx86DebuggerVersion()) - component.addElevatedOperation("Execute", "{0,3010,1638,5100}", "msiexec", "/i", "@TargetDir@\\vcredist\\x86 Debuggers And Tools-x86_en-us.msi", "/norestart", "/q"); + component.addElevatedOperation("Execute", "{0,3010,1638,1618,5100}", "msiexec", "/i", "@TargetDir@\\vcredist\\x86 Debuggers And Tools-x86_en-us.msi", "/norestart", "/q"); } |