diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-04 09:19:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-04 09:19:28 +0200 |
| commit | c868b9f3ed1bbd499195e158f44cb51f093a0177 (patch) | |
| tree | dc1fcae11aa4c66bc17fa359299196652b9f2e8d /dist | |
| parent | 2ffe1ac68f878011cad534cffe0e983b428f6f14 (diff) | |
| parent | e873f872ef2a2ba1342dd013ab2e184e6676a71a (diff) | |
Merge remote-tracking branch 'origin/3.5'
Change-Id: Ife5fdcd71b0adc99d4297a28a64515e9e93d7864
Diffstat (limited to 'dist')
3 files changed, 2 insertions, 2 deletions
diff --git a/dist/installer/ifw/config/config-windows.xml.in b/dist/installer/ifw/config/config-windows.xml.in index 33c29dd594..574e70568c 100644 --- a/dist/installer/ifw/config/config-windows.xml.in +++ b/dist/installer/ifw/config/config-windows.xml.in @@ -12,4 +12,5 @@ <MaintenanceToolName>QtCreatorUninst</MaintenanceToolName> <!-- @homeDir@ and @rootDir@ are some of the supported vars --> <TargetDir>@rootDir@/Qt/qtcreator-{version}</TargetDir> + <StartMenuDir>Qt Creator</StartMenuDir> </Installer> 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 8efee55834..6f9d59dcec 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 @@ -153,7 +153,7 @@ Component.prototype.createOperations = function() { component.addOperation( "CreateShortcut", component.qtCreatorBinaryPath, - "@StartMenuDir@/Qt Creator.lnk", + "@StartMenuDir@/Qt Creator " + installer.value("ProductVersion") + ".lnk", "workingDirectory=@homeDir@" ); // only install c runtime if it is needed, no minor version check of the c runtime till we need it diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in index 32089ef2bb..682fd720b9 100644 --- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in +++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in @@ -17,5 +17,4 @@ <UserInterface>associatecommonfiletypesform.ui</UserInterface> <UserInterface>launchqtcreatorcheckboxform.ui</UserInterface> </UserInterfaces> - <StartMenuDir>Qt Creator {version}</StartMenuDir> </Package> |