Liang Qi c7cdf3aac7 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/mimetypes/qmimeprovider.cpp src/corelib/mimetypes/qmimetype.cpp Change-Id: Ib483ddb6bfc380e7c8f195feca535703814c3872		2016-08-25 16:12:11 +02:00
..
default.xcscheme	Xcode: Don't enable document versioning debugging	2016-08-24 12:35:45 +00:00
qmake.conf	Xcode: Generate scheme manually, instead of letting Xcode do it	2015-03-06 19:01:43 +00:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00
QtTest.plist	Add XCTest logger backend to QtTestLib	2015-03-27 16:53:43 +00:00
WorkspaceSettings.xcsettings	Xcode: Generate scheme manually, instead of letting Xcode do it	2015-03-06 19:01:43 +00:00