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
..
Info.plist.app	qmake: Pick up default bundle prefix from Xcode preferences	2013-10-31 12:33:55 +01: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 CFBundleIdentifier to the bundle Info.plist's	2014-11-10 16:04:12 +01:00
qmake.conf	Bump the minimum supported OS X version	2016-04-07 23:55:25 +00:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00