From 69f8e48de48820f90e400fe909f210c519573bcf Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Tue, 16 Oct 2012 13:55:53 +0200
Subject: [PATCH] Rename the (un)installers.

Windows has a problem with "install" in the name. Use .bin on Linux like
before.

Change-Id: I4f887a8c0442cd9f0a17425f68a36a371ae9f6b7
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
---
 dist/installer/ifw/config/config-windows.xml.in | 2 +-
 qtcreator.pro                                   | 2 +-
 scripts/packageIfw.py                           | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dist/installer/ifw/config/config-windows.xml.in b/dist/installer/ifw/config/config-windows.xml.in
index 0d9d8e87c1..4d814a4f29 100644
--- a/dist/installer/ifw/config/config-windows.xml.in
+++ b/dist/installer/ifw/config/config-windows.xml.in
@@ -9,7 +9,7 @@
 
     <Icon>logo.png</Icon>
     <Watermark>watermark.png</Watermark>
-    <UninstallerName>QtCreatorUninstaller</UninstallerName>
+    <UninstallerName>QtCreatorUninst</UninstallerName>
     <!-- @homeDir@ and @rootDir@ are some of the supported vars -->
     <TargetDir>@rootDir@/Qt/qtcreator-{version}</TargetDir>
 
diff --git a/qtcreator.pro b/qtcreator.pro
index 6527d890e5..d736de7ef2 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -54,7 +54,7 @@ bindist.commands = 7z a -mx9 $$OUT_PWD/qt-creator-$${PATTERN}.7z \"$$BINDIST_SOU
 bindist_installer.depends = deployqt
 bindist_installer.commands = 7z a -mx9 $$OUT_PWD/qt-creator-$${PATTERN}-installer-archive.7z \"$$BINDIST_INSTALLER_SOURCE\"
 installer.depends = bindist_installer
-installer.commands = $$PWD/scripts/packageIfw.py -i \"$(IFW_PATH)\" -v $${QTCREATOR_VERSION} -a \"$$INSTALLER_ARCHIVE\" "qt-creator-$${PATTERN}-installer"
+installer.commands = $$PWD/scripts/packageIfw.py -i \"$(IFW_PATH)\" -v $${QTCREATOR_VERSION} -a \"$$INSTALLER_ARCHIVE\" "qt-creator-$${PATTERN}"
 
 win32 {
     deployqt.commands ~= s,/,\\\\,g
diff --git a/scripts/packageIfw.py b/scripts/packageIfw.py
index c6f55bc265..90494a2d6b 100755
--- a/scripts/packageIfw.py
+++ b/scripts/packageIfw.py
@@ -93,6 +93,7 @@ def main():
         config_postfix = '-windows'
     if sys.platform.startswith('linux'):
         config_postfix = '-linux'
+        installer_name = installer_name + '.bin'
 
     config_name = 'config' + config_postfix + '.xml'
 
-- 
GitLab