aboutsummaryrefslogtreecommitdiffstats
path: root/qtcreator.pro
diff options
context:
space:
mode:
authorDaniel Molkentin <daniel.molkentin@nokia.com>2012-01-17 19:33:45 +0100
committerDaniel Molkentin <daniel.molkentin@nokia.com>2012-01-18 15:53:50 +0100
commitab079b86cf175dd1818db92fa9badd4013237042 (patch)
tree6ca83f5b78a09db56863fad89d21abd529a18082 /qtcreator.pro
parent17a7bd17d08489453d6a679aab711a946e023ff3 (diff)
Add platform names and versions
Also introduce $INSTALL_EDITION env var which acts as infix. (possible values: opensource, commercial, etc) Change-Id: I86f58444b21853ae4bcb8509e491610c76c414da Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'qtcreator.pro')
-rw-r--r--qtcreator.pro9
1 files changed, 6 insertions, 3 deletions
diff --git a/qtcreator.pro b/qtcreator.pro
index 39df9754b7..2296d8eadb 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -24,14 +24,17 @@ macx {
-executable="$${APPBUNDLE}/Contents/Resources/qtpromaker" \
-executable="$${APPBUNDLE}/Contents/MacOS/qmlprofiler"
deployqt.depends = default
- bindist.commands = 7z a -mx9 $$OUT_PWD/qtcreator$(INSTALL_POSTFIX).7z "$$OUT_PWD/bin/Qt Creator.app/"
- dmg.commands = $$PWD/scripts/makedmg.sh $$OUT_PWD/bin qt-creator$(INSTALL_POSTFIX).dmg
+ bindist.commands = 7z a -mx9 $$OUT_PWD/qtcreator-mac$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX).7z "$$OUT_PWD/bin/Qt Creator.app/"
+ dmg.commands = $$PWD/scripts/makedmg.sh $$OUT_PWD/bin qt-creator-mac$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX).dmg
QMAKE_EXTRA_TARGETS += dmg
} else {
deployqt.commands = $$PWD/scripts/deployqt.py -i $(INSTALL_ROOT)
win32:deployqt.commands ~= s,/,\\\\,g
deployqt.depends = install
- bindist.commands = 7z a -mx9 $$OUT_PWD/qtcreator$(INSTALL_POSTFIX).7z $(INSTALL_ROOT)
+ bindist.commands = $$PWD/scripts/bindistHelper.py $(INSTALL_ROOT) $${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX)
+ win32:PLATFORM="windows"
+ else:linux-*:PLATFORM="linux-$${QT_ARCH}"
+ else:PLATFORM="unknown"
win32:bindist.commands ~= s,/,\\\\,g
}
bindist.depends = deployqt