feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.1' into 4.2

Browse Source 
Conflicts:
	scripts/deployqtHelper_mac.sh
	src/plugins/ios/iostoolhandler.cpp

Change-Id: I06219e1c137e8f58f295da423363360457fa0b11
This commit is contained in:
Eike Ziller
2016-10-24 08:31:00 +02:00
parent f5b3dcfc83 c1a46127cf
commit 504a525b35
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/deployqtHelper_mac.sh
View File

@@ -144,8 +144,6 @@ if [ ! -d "$app_path/Contents/Frameworks/QtCore.framework" ]; then
"-executable=$app_path/Contents/Resources/qtpromaker" \ "-executable=$app_path/Contents/Resources/qtpromaker" \
"-executable=$app_path/Contents/Resources/sdktool" \ "-executable=$app_path/Contents/Resources/sdktool" \
"-executable=$app_path/Contents/Resources/ios/iostool" \ "-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/buildoutputparser" \
"-executable=$app_path/Contents/Resources/cpaster" \ "-executable=$app_path/Contents/Resources/cpaster" \
"-executable=$app_path/Contents/MacOS/qtdiag" \ "-executable=$app_path/Contents/MacOS/qtdiag" \