qt5base-lts/mkspecs/macx-ios-clang
Liang Qi 3e949b75fd Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	mkspecs/features/mac/default_pre.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	qtbase.pro

Change-Id: I65b5ebca4942a4f295bdd4ac1568e5c347333aea
2016-10-01 22:15:55 +02:00
..
features Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-01 22:15:55 +02:00
Default-568h@2x.png iOS: Provide default launch image for 4-inch devices 2013-11-29 09:55:23 +01:00
Info.plist.app Remove exec bits from files that should not be executable 2015-06-07 22:50:19 +00:00
Info.plist.dSYM.in qmake: Add support for separate debug info on Apple platforms. 2016-04-14 21:28:54 +00:00
Info.plist.lib Add CFBundleVersion to the Info.plist files. 2014-10-01 10:56:41 +02:00
ios_destinations.sh Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-25 16:12:11 +02:00
ios_devices.pl iOS, mkspec: update UUID parsing to support Xcode 8 beta 2016-08-24 13:05:09 +00:00
LaunchScreen.xib iOS: let qmake generate default LaunchScreen.xib 2014-11-11 20:43:05 +01:00
qmake.conf purge vestige: plugin_no_soname is no more 2016-06-22 15:13:02 +00:00
qplatformdefs.h Updated license headers 2016-01-15 12:25:24 +00:00
xcodebuild.mk Pass -quiet to xcodebuild when invoking make with -s option 2016-09-21 21:42:22 +00:00