From 2186d0815a0b3434b1c306796ac0587c12f9fe82 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@theqtcompany.com>
Date: Mon, 24 Aug 2015 14:07:25 +0200
Subject: Another try to fix that installer doesn't suggest start menu folder
 name

Change-Id: I584fe0ef595472144302252005d78ef66d8e0f99
Task-number: QTCREATORBUG-14674
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 dist/installer/ifw/config/config-windows.xml.in                         | 1 +
 .../packages/org.qtproject.qtcreator.application/meta/installscript.qs  | 2 +-
 .../packages/org.qtproject.qtcreator.application/meta/package.xml.in    | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'dist')

diff --git a/dist/installer/ifw/config/config-windows.xml.in b/dist/installer/ifw/config/config-windows.xml.in
index 33c29dd5941..574e70568c2 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 2f392772fba..a7fada95e04 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 32089ef2bb9..682fd720b9f 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>
-- 
cgit v1.2.3