Liang Qi bb4b86618d Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: config.tests/unix/compile.test configure src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java src/corelib/global/qglobal.cpp src/widgets/kernel/qapplication.cpp src/widgets/styles/qwindowsvistastyle.cpp tests/auto/corelib/kernel/qobject/tst_qobject.cpp Change-Id: I067083f34e5290aa5f7565e40c30a069cc37b83a		2016-04-25 14:03:45 +02:00
..
features	Generalize iOS simulator and device exclusive build	2016-02-12 18:43:31 +00: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	Updated license headers	2016-01-15 12:25:24 +00:00
LaunchScreen.xib	iOS: let qmake generate default LaunchScreen.xib	2014-11-11 20:43:05 +01:00
qmake.conf	iOS: Use LC_MAIN to wrap user main() instead of mangling object files	2015-06-29 12:39:50 +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