From c05e9d52b2721d442c62e1ce4ed1058a756bf396 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 2 Oct 2013 16:09:23 +0200 Subject: Ios: Move tools to /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 --- scripts/deployqtHelper_mac.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'scripts') 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 -- cgit v1.2.1