AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a1ad9a74eb
qt5base-lts/tests/auto/gui/text
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
..
qabstracttextdocumentlayout Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qcssparser Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qfont Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
qfontcache Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qfontdatabase Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qfontmetrics Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qglyphrun Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qrawfont Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qstatictext Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qsyntaxhighlighter Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qtextblock Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qtextcursor Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qtextdocument tests/auto/gui: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). 2015-07-31 08:29:15 +00:00
qtextdocumentfragment tests/auto/gui: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). 2015-07-31 08:29:15 +00:00
qtextdocumentlayout Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qtextformat Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qtextlayout Move min left/right bearing calculations to QFontEngine baseclass 2015-09-02 09:11:31 +00:00
qtextlist Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qtextobject Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qtextodfwriter Update copyright headers 2015-02-11 06:49:51 +00:00
qtextpiecetable tests/auto/gui: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). 2015-07-31 08:29:15 +00:00
qtextscriptengine Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qtexttable Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qzip QZip*: don't hold QZipReader::FileInfo in QList 2015-07-19 10:35:41 +00:00
text.pro Fix the font engines leaking 2013-03-20 07:02:29 +01:00