diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-10-02 16:09:23 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-07 15:32:10 +0200 |
| commit | c05e9d52b2721d442c62e1ce4ed1058a756bf396 (patch) | |
| tree | fe7075c906d2d8b6a455c5b2041b874a4d1af58b /scripts/deployqtHelper_mac.sh | |
| parent | 810274d038dc1daf22db42de1b5318d5157ffb85 (diff) | |
| download | qt-creator-c05e9d52b2721d442c62e1ce4ed1058a756bf396.tar.gz | |
Ios: Move tools to <libexec>/ios, make them lowercase, fix deployment
They can't be directly in libexec path, because then they couldn't have
their own qt.conf for resolving the Cocoa platform plugin.
Change-Id: I8f3fae85c548747a7d826c078c7ac1fb0a836b43
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'scripts/deployqtHelper_mac.sh')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 1151a02141..daa73bf12d 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -41,10 +41,16 @@ fi macdeployqt "$1" \ "-executable=$1/Contents/Resources/qtpromaker" \ - "-executable=$1/Contents/Resources/sdktool" "$qmlpuppetArgument" "$qml2puppetArgument" || exit 1 + "-executable=$1/Contents/Resources/sdktool" \ + "-executable=$1/Contents/Resources/ios/iostool" \ + "-executable=$1/Contents/Resources/ios/iossim" \ + "$qmlpuppetArgument" "$qml2puppetArgument" || exit 1 # copy qt creator qt.conf cp -f "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qt.conf" "$1/Contents/Resources/qt.conf" || exit 1 +# copy ios tools' qt.conf +cp -f "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/ios_qt.conf" "$1/Contents/Resources/ios/qt.conf" || exit 1 + # copy Qt translations cp "$2"/*.qm "$1/Contents/Resources/translations/" || exit 1 |