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
..
main.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-25 16:12:11 +02:00
multiwindow.pro	Add a multiwindow manual test using QOpenGLWindow	2014-09-18 10:06:18 +02:00