From e0b518b832790b790b5fd34d8576daefcf33bf33 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 22 Aug 2014 12:25:11 +0200 Subject: [PATCH] OSX: Fix deployment of qml puppets They are no longer app bundles Change-Id: Ia2b9c62d478ae4ccacb20dc20eda44695d0fe960 Reviewed-by: Tim Jenssen --- dist/installer/mac/qmlpuppet_qt.conf | 4 ---- scripts/deployqtHelper_mac.sh | 14 ++++---------- 2 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 dist/installer/mac/qmlpuppet_qt.conf diff --git a/dist/installer/mac/qmlpuppet_qt.conf b/dist/installer/mac/qmlpuppet_qt.conf deleted file mode 100644 index 034fabe6f8a..00000000000 --- a/dist/installer/mac/qmlpuppet_qt.conf +++ /dev/null @@ -1,4 +0,0 @@ -[Paths] -Imports = ../../../Imports/qtquick1 -Qml2Imports = ../../../Imports/qtquick2 -Plugins = ../../../PlugIns diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 3331e27a2e9..78188870b64 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -23,20 +23,14 @@ if [ -d "$5" ]; then cp -R "$5"/ "$imports2Dir"/ fi -qmlpuppetapp="$1/Contents/MacOS/qmlpuppet.app" +qmlpuppetapp="$1/Contents/MacOS/qmlpuppet" 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 + qmlpuppetArgument="-executable=$qmlpuppetapp" fi -qml2puppetapp="$1/Contents/MacOS/qml2puppet.app" +qml2puppetapp="$1/Contents/MacOS/qml2puppet" if [ -d "$qml2puppetapp" ]; then - qml2puppetArgument="-executable=$qml2puppetapp/Contents/MacOS/qml2puppet" - qml2puppetResources="$1/Contents/MacOS/qml2puppet.app/Contents/Resources" - test -d "$qml2puppetResources" || mkdir -p "$qml2puppetResources" - cp "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qmlpuppet_qt.conf" "$qml2puppetResources/qt.conf" || exit 1 + qml2puppetArgument="-executable=$qml2puppetapp" fi macdeployqt "$1" \