diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-09-26 15:08:37 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-09-26 15:43:37 +0200 |
| commit | 455d597ac3cb6f1f6e1cc500c0a009df12cb4fcc (patch) | |
| tree | 1c570139de5bdbbc753823b88d36bd8454f4b770 /scripts/deployqtHelper_mac.sh | |
| parent | 696b0a8b8039e7d920f0daad967b51f179db60d4 (diff) | |
Fix deploying Qt on Mac (qt quick imports)
Since we are using Qt Quick 2 now, Qt Creator also needs to find the Qt
Quick 2 imports.
Also make qmlpuppet (Qt Quick 1) optional for deploying Qt.
Task-number: QTBUG-33545
Change-Id: I296e4b3a1827f7b26841e94e15eda718afef81d0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'scripts/deployqtHelper_mac.sh')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index bcb4b36fea..1151a02141 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -23,6 +23,14 @@ if [ -d "$5" ]; then cp -R "$5"/ "$imports2Dir"/ fi +qmlpuppetapp="$1/Contents/MacOS/qmlpuppet.app" +if [ -d "$qmlpuppetapp" ]; then + qmlpuppetArgument="-executable=$qmlpuppetapp/Contents/MacOS/qmlpuppet" + qmlpuppetResources="$1/Contents/MacOS/qmlpuppet.app/Contents/Resources" + test -d "$qmlpuppetResources" || mkdir -p "$qmlpuppetResources" + cp "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qmlpuppet_qt.conf" "$qmlpuppetResources/qt.conf" || exit 1 +fi + qml2puppetapp="$1/Contents/MacOS/qml2puppet.app" if [ -d "$qml2puppetapp" ]; then qml2puppetArgument="-executable=$qml2puppetapp/Contents/MacOS/qml2puppet" @@ -32,13 +40,11 @@ if [ -d "$qml2puppetapp" ]; then fi macdeployqt "$1" \ - "-executable=$1/Contents/MacOS/qmlpuppet.app/Contents/MacOS/qmlpuppet" \ "-executable=$1/Contents/Resources/qtpromaker" \ - "-executable=$1/Contents/Resources/sdktool" "$qml2puppetArgument" || exit 1 + "-executable=$1/Contents/Resources/sdktool" "$qmlpuppetArgument" "$qml2puppetArgument" || exit 1 -qmlpuppetResources="$1/Contents/MacOS/qmlpuppet.app/Contents/Resources" -test -d "$qmlpuppetResources" || mkdir -p "$qmlpuppetResources" -cp "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qmlpuppet_qt.conf" "$qmlpuppetResources/qt.conf" || exit 1 +# copy qt creator qt.conf +cp -f "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qt.conf" "$1/Contents/Resources/qt.conf" || exit 1 # copy Qt translations cp "$2"/*.qm "$1/Contents/Resources/translations/" || exit 1 |