feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Mac/deployqt: Give qmlpuppet the correct qt.conf

Browse Source 
Change-Id: I73162205f8ed9978eeaca2a91e331d2e323b15ef
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
This commit is contained in:
Eike Ziller
2012-01-24 13:59:07 +01:00
parent 4cc4567a80
commit d8a3b3a1e9
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/installer/mac/qmlpuppet_qt.conf
Vendored
+2
View File
@@ -0,0 +1,2 @@
[Paths]
Imports = ../..
qtcreator.pro
+3 -6
View File
@@ -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)
scripts/deployqtHelper_mac.sh
Executable
+8
View File
@@ -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"