diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-05-17 17:07:47 -0700 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-05-18 12:40:37 +0000 |
| commit | 69d5fc12578dc5d7a65bfe17aa7a4e904c9bb103 (patch) | |
| tree | ef5bc87023203e94f30c291338cc0f4af790ec0b | |
| parent | c427650d62c369ed71d95cacd05c21dd7bf79810 (diff) | |
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: Eike Ziller <eike.ziller@theqtcompany.com>
| -rw-r--r-- | dist/changes-3.4.1.md | 3 | ||||
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/dist/changes-3.4.1.md b/dist/changes-3.4.1.md index 4e87aace4d..23c65d80cd 100644 --- a/dist/changes-3.4.1.md +++ b/dist/changes-3.4.1.md @@ -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 diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 974e008043..638cc2f006 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -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 |