diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-04-23 09:39:09 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-04-23 09:39:09 +0200 |
| commit | 6c2c5052288e399a7abfac714a3cbab3795a3baf (patch) | |
| tree | 2ca5ac33e761fe4168707a08b9bee1bd5d91f427 /dist | |
| parent | c2c18b3c8ea61ea3f4f3898f9236fb699d02b16a (diff) | |
| parent | c92adf5ab472a8d886034bbfe67aebb22d932270 (diff) | |
Merge remote-tracking branch 'origin/3.4'
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs | 5 |
1 files changed, 1 insertions, 4 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 823e827b34..2f392772fb 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 @@ -60,11 +60,8 @@ Component.prototype.beginInstallation = function() else if (installer.value("os") == "mac") component.qtCreatorBinaryPath = component.qtCreatorBinaryPath + "/Qt Creator.app/Contents/MacOS/Qt Creator"; - if ( installer.value("os") === "win" ) { + if ( installer.value("os") === "win" ) component.setStopProcessForUpdateRequest(component.qtCreatorBinaryPath, true); - component.setStopProcessForUpdateRequest("@TargetDir@/bin/linguist.exe", true); - component.setStopProcessForUpdateRequest("@TargetDir@/bin/qmlviewer.exe", true); - } } registerCommonWindowsFileTypeExtensions = function() |