Follow-up fixes for the libexec path change

The fallback puppet must be found in libexecPath now.
Deployment on OS X must also be adapted to the new location.
Broke with 6d5a5aff94

Change-Id: I8dc3d62188a2f19a7e203f939bd88065fb0504f8
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

scripts/deployqtHelper_mac.sh

@@ -82,12 +82,7 @@ fi
 
 if [ ! -d "$1/Contents/Frameworks/QtCore.framework" ]; then
 
-    qmlpuppetapp="$1/Contents/MacOS/qmlpuppet"
-    if [ -f "$qmlpuppetapp" ]; then
-        qmlpuppetArgument="-executable=$qmlpuppetapp"
-    fi
-
-    qml2puppetapp="$1/Contents/MacOS/qml2puppet"
+    qml2puppetapp="$1/Contents/Resources/qml2puppet"
     if [ -f "$qml2puppetapp" ]; then
         qml2puppetArgument="-executable=$qml2puppetapp"
     fi
@@ -111,6 +106,6 @@ if [ ! -d "$1/Contents/Frameworks/QtCore.framework" ]; then
         "-executable=$qbsapp-setup-android" \
         "-executable=$qbsapp-setup-qt" \
         "-executable=$qbsapp-setup-toolchains" \
-        "$qmlpuppetArgument" "$qml2puppetArgument" "$clangbackendArgument" || exit 1
+        "$qml2puppetArgument" "$clangbackendArgument" || exit 1
 
 fi