summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2017-04-06 18:48:32 -0700
committerJake Petroules <jake.petroules@qt.io>2017-04-19 01:44:38 +0000
commitb3771305095bfaa2c23528f2092cb2edcaf11a47 (patch)
tree4fa412b822b60dd15fa2a0042d9f27cf8c15018b
parent8c7079dd2486f07a7721eac162b5ae3df6ad5051 (diff)
downloadqt-creator-b3771305095bfaa2c23528f2092cb2edcaf11a47.tar.gz
Specify absolute path to macdeployqt
This script receives the QT_INSTALL_BINS directory as an input argument, so make use of it so that the caller does not need to have that path in the PATH in order to find macdeployqt. Change-Id: I5e5197104119a19ecda83c3bbc256f3fe492c0a6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rwxr-xr-xscripts/deployqtHelper_mac.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh
index 5039c89e82..2ee40242f5 100755
--- a/scripts/deployqtHelper_mac.sh
+++ b/scripts/deployqtHelper_mac.sh
@@ -134,9 +134,9 @@ if [ ! -d "$app_path/Contents/Frameworks/QtCore.framework" ]; then
qbsapp="$app_path/Contents/MacOS/qbs"
- echo "- Running macdeployqt ($(which macdeployqt))"
+ echo "- Running macdeployqt ($bin_src/macdeployqt)"
- macdeployqt "$app_path" \
+ "$bin_src/macdeployqt" "$app_path" \
"-executable=$app_path/Contents/MacOS/qtdiag" \
"-executable=$resource_path/qtpromaker" \
"-executable=$resource_path/sdktool" \