Commit 69d5fc12 authored by Jake Petroules's avatar Jake Petroules Committed by Eike Ziller

Run macdeployqt for the remaining auxiliary executables.

This fixes broken library paths for buildoutputparser and qbs
executables on OS X, making them unusable out of the box.

Task-number: QTCREATORBUG-14432
Change-Id: I81c64f962b0a1eee2800da04b5202f5fd9efb706
Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
parent c427650d
......@@ -56,6 +56,9 @@ QML Support
Platform Specific
OS X
* Fixed broken library paths for qbs executables (QTCREATORBUG-14432)
BareMetal
* Fixed issues when moving from Qt Creator 3.3 to Qt Creator 3.4
......@@ -83,6 +83,8 @@ if [ ! -d "$1/Contents/Frameworks/QtCore.framework" ]; then
qml2puppetArgument="-executable=$qml2puppetapp"
fi
qbsapp="$1/Contents/MacOS/qbs"
echo "- Running macdeployqt ($(which macdeployqt))"
macdeployqt "$1" \
......@@ -91,6 +93,14 @@ if [ ! -d "$1/Contents/Frameworks/QtCore.framework" ]; then
"-executable=$1/Contents/Resources/ios/iostool" \
"-executable=$1/Contents/Resources/ios/iossim" \
"-executable=$1/Contents/Resources/ios/iossim_1_8_2" \
"-executable=$1/Contents/MacOS/buildoutputparser" \
"-executable=$qbsapp" \
"-executable=$qbsapp-config" \
"-executable=$qbsapp-config-ui" \
"-executable=$qbsapp-qmltypes" \
"-executable=$qbsapp-setup-android" \
"-executable=$qbsapp-setup-qt" \
"-executable=$qbsapp-setup-toolchains" \
"$qmlpuppetArgument" "$qml2puppetArgument" || exit 1
fi
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment