Liang Qi a1ad9a74eb Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/io.pri src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/network/socket/qabstractsocket.cpp src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h src/widgets/styles/qgtkstyle.cpp tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro tests/auto/dbus/qdbusconnection/qdbusconnection.pro tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7		2015-09-25 14:02:04 +02:00
..
images	Moved integrationtests/* into other/	2011-11-30 09:30:22 +01:00
scripts	Add lancelot test for Emoji text rendering / color glyphs	2015-06-25 16:53:50 +00:00
.gitignore	Moved integrationtests/* into other/	2011-11-30 09:30:22 +01:00
images.qrc	Moved integrationtests/* into other/	2011-11-30 09:30:22 +01:00
lancelot.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
paintcommands.cpp	lance: Ensure that OpenGL FBO is cleared before being used as surface	2015-06-26 10:55:40 +00:00
paintcommands.h	Update copyright headers	2015-02-11 06:49:51 +00:00
tst_lancelot.cpp	Add getter and setter for qt_qhash_seed	2015-09-22 14:17:46 +00:00