whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/gui/image
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
..
qicoimageformat Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
qicon QIconLoader: Use the GTK+ icon caches 2015-09-13 16:23:24 +00:00
qimage Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qimageiohandler Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qimagereader tests/auto/gui: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). 2015-07-31 08:29:15 +00:00
qimagewriter MSVC: Remove use of -Zm argument 2015-02-13 21:23:19 +00:00
qmovie Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qpicture Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qpixmap tests/auto/gui: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). 2015-07-31 08:29:15 +00:00
qpixmapcache Add method for checking of QPixmapCache::Key validity 2015-09-18 13:48:05 +00:00
image.pro Check for network module when building according auto tests 2013-02-19 19:20:53 +01:00