diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-04-19 09:56:14 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-04-19 09:56:14 +0200 |
| commit | 88897f3a870de7b756356907801f09a90902e490 (patch) | |
| tree | a947c7fdb92d9050e9ade763dcb87db192b4585e /scripts | |
| parent | 8b6eb5aabb48fb83c3cd92be9a77401ca26a810b (diff) | |
| parent | 01b2ed7904132f845819e78c84477ac9a66bd1e3 (diff) | |
Merge remote-tracking branch 'origin/4.3'
Conflicts:
src/plugins/genericprojectmanager/genericproject.cpp
src/plugins/genericprojectmanager/genericproject.h
src/plugins/genericprojectmanager/genericprojectnodes.cpp
src/plugins/genericprojectmanager/genericprojectnodes.h
Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 4 |
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" \ |