diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-08-22 12:25:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-08-22 12:44:47 +0200 |
| commit | e0b518b832790b790b5fd34d8576daefcf33bf33 (patch) | |
| tree | 0896b1ad5c61517abbdd8dd75caca85d4320d155 /scripts/deployqtHelper_mac.sh | |
| parent | 82bb8ce3ed1404f5f90b678d7ee4dfcda0fc15f3 (diff) | |
OSX: Fix deployment of qml puppets
They are no longer app bundles
Change-Id: Ia2b9c62d478ae4ccacb20dc20eda44695d0fe960
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'scripts/deployqtHelper_mac.sh')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 3331e27a2e..78188870b6 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" \ |