diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-10-24 08:31:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-10-24 08:31:00 +0200 |
| commit | 504a525b35c020bcb9c3343efb8bb460ac098992 (patch) | |
| tree | ebf28f0c586e99995ffb4ee9e4709caff1e158ee /scripts | |
| parent | f5b3dcfc8337c47da570fae4a217f40b22a20750 (diff) | |
| parent | c1a46127cfe46204da9eb35ffffb7631615c5f2e (diff) | |
Merge remote-tracking branch 'origin/4.1' into 4.2
Conflicts:
scripts/deployqtHelper_mac.sh
src/plugins/ios/iostoolhandler.cpp
Change-Id: I06219e1c137e8f58f295da423363360457fa0b11
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index ca91e8dac2..231825f9ae 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -144,8 +144,6 @@ if [ ! -d "$app_path/Contents/Frameworks/QtCore.framework" ]; then "-executable=$app_path/Contents/Resources/qtpromaker" \ "-executable=$app_path/Contents/Resources/sdktool" \ "-executable=$app_path/Contents/Resources/ios/iostool" \ - "-executable=$app_path/Contents/Resources/ios/iossim" \ - "-executable=$app_path/Contents/Resources/ios/iossim_1_8_2" \ "-executable=$app_path/Contents/Resources/buildoutputparser" \ "-executable=$app_path/Contents/Resources/cpaster" \ "-executable=$app_path/Contents/MacOS/qtdiag" \ |