From d8a3b3a1e9ca4475159c6c2138b758cf7ae79ca0 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@nokia.com>
Date: Tue, 24 Jan 2012 13:59:07 +0100
Subject: [PATCH] Mac/deployqt: Give qmlpuppet the correct qt.conf
Change-Id: I73162205f8ed9978eeaca2a91e331d2e323b15ef
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
---
dist/installer/mac/qmlpuppet_qt.conf | 2 ++
qtcreator.pro | 9 +++------
scripts/deployqtHelper_mac.sh | 8 ++++++++
3 files changed, 13 insertions(+), 6 deletions(-)
create mode 100644 dist/installer/mac/qmlpuppet_qt.conf
create mode 100755 scripts/deployqtHelper_mac.sh
diff --git a/dist/installer/mac/qmlpuppet_qt.conf b/dist/installer/mac/qmlpuppet_qt.conf
new file mode 100644
index 00000000000..34a32f60971
--- /dev/null
+++ b/dist/installer/mac/qmlpuppet_qt.conf
@@ -0,0 +1,2 @@
+[Paths]
+Imports = ../..
diff --git a/qtcreator.pro b/qtcreator.pro
index 2296d8eadb2..eaba81fb621 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -19,13 +19,10 @@ OTHER_FILES += dist/copyright_template.txt \
macx {
APPBUNDLE = "$$OUT_PWD/bin/Qt Creator.app"
- deployqt.commands = macdeployqt "$${APPBUNDLE}" \
- -executable="$${APPBUNDLE}/Contents/MacOS/qmlpuppet.app/Contents/MacOS/qmlpuppet" \
- -executable="$${APPBUNDLE}/Contents/Resources/qtpromaker" \
- -executable="$${APPBUNDLE}/Contents/MacOS/qmlprofiler"
- deployqt.depends = default
- bindist.commands = 7z a -mx9 $$OUT_PWD/qtcreator-mac$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX).7z "$$OUT_PWD/bin/Qt Creator.app/"
+ deployqt.commands = $$PWD/scripts/deployqtHelper_mac.sh \"$${APPBUNDLE}\"
+ 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
+ dmg.depends = deployqt
QMAKE_EXTRA_TARGETS += dmg
} else {
deployqt.commands = $$PWD/scripts/deployqt.py -i $(INSTALL_ROOT)
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh
new file mode 100755
index 00000000000..adbbbb9585d
--- /dev/null
+++ b/scripts/deployqtHelper_mac.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+macdeployqt "$1" \
+ "-executable=$1/Contents/MacOS/qmlpuppet.app/Contents/MacOS/qmlpuppet" \
+ "-executable=$1/Contents/Resources/qtpromaker" \
+ "-executable=$1/Contents/MacOS/qmlprofiler" || exit 1
+qmlpuppetResources="$1/Contents/MacOS/qmlpuppet.app/Contents/Resources"
+mkdir "$qmlpuppetResources"
+cp "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qmlpuppet_qt.conf" "$qmlpuppetResources/qt.conf"
--
GitLab