From efe2bf73affb8c49e9dbb43cc7bca4ee4bf3855a Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Thu, 30 Mar 2017 10:54:04 +0200
Subject: [PATCH] macOS: Fix deployment of qbs_processlauncher and
qbs-create-project
Change-Id: If38d11b452dc37dc3a5694c57d43a7a4e1635904
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
scripts/deployqtHelper_mac.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh
index 231825f9ae4..d242b470a96 100755
--- a/scripts/deployqtHelper_mac.sh
+++ b/scripts/deployqtHelper_mac.sh
@@ -141,12 +141,13 @@ if [ ! -d "$app_path/Contents/Frameworks/QtCore.framework" ]; then
echo "- Running macdeployqt ($(which macdeployqt))"
macdeployqt "$app_path" \
+ "-executable=$app_path/Contents/MacOS/qtdiag" \
"-executable=$app_path/Contents/Resources/qtpromaker" \
"-executable=$app_path/Contents/Resources/sdktool" \
"-executable=$app_path/Contents/Resources/ios/iostool" \
"-executable=$app_path/Contents/Resources/buildoutputparser" \
"-executable=$app_path/Contents/Resources/cpaster" \
- "-executable=$app_path/Contents/MacOS/qtdiag" \
+ "-executable=$app_path/Contents/Resources/qbs_processlauncher" \
"-executable=$qbsapp" \
"-executable=$qbsapp-config" \
"-executable=$qbsapp-config-ui" \
@@ -154,6 +155,7 @@ if [ ! -d "$app_path/Contents/Frameworks/QtCore.framework" ]; then
"-executable=$qbsapp-setup-android" \
"-executable=$qbsapp-setup-qt" \
"-executable=$qbsapp-setup-toolchains" \
+ "-executable=$qbsapp-create-project" \
"$qml2puppetArgument" "$clangbackendArgument" || exit 1
fi
--
GitLab