AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a1ad9a74eb
qt5base-lts/tests/auto/gui
History
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
..
image Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
itemmodels Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
kernel Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
math3d Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
painting Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qopengl Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qopenglconfig Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
text Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
util Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
gui.pro Add qopenglconfig test. 2015-02-02 23:05:41 +00:00