Liang Qi 6b8f422c5e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/io/qsettings.cpp src/corelib/itemmodels/qstringlistmodel.cpp tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03		2016-08-13 01:05:02 +02:00
..
features	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +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-13 01:05:02 +02: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	iOS: Map make install to xcodebuild build for the iOS simulator	2015-11-26 15:37:58 +00:00