qt5base-lts/tests/auto/gui/text
Liang Qi 57057f76ad Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	.qmake.conf
	config.tests/unix/nis/nis.cpp
	mkspecs/unsupported/freebsd-g++/qplatformdefs.h
	src/corelib/tools/qdatetime.cpp
	src/corelib/tools/qsimd.cpp
	src/corelib/tools/qsimd_p.h
	src/network/access/access.pri
	src/network/access/qnetworkreplynsurlconnectionimpl.mm
	src/network/access/qnetworkreplynsurlconnectionimpl_p.h
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/printsupport/windows/qwindowsprintdevice.cpp
	tests/auto/corelib/kernel/qobject/tst_qobject.cpp
	tests/auto/network/access/qnetworkreply/BLACKLIST
	tests/auto/widgets/widgets/qopenglwidget/BLACKLIST

Change-Id: I4b32055bbf922392ef0264fd403405416fffee57
2016-06-06 09:04:55 +02:00
..
qabstracttextdocumentlayout Remove insignificant from qabstracttextdocumentlayout test 2016-01-22 09:13:27 +00:00
qcssparser Updated license headers 2016-01-21 18:55:18 +00:00
qfont Remove dead code from tst_QFont::exactMatch() 2016-05-12 10:13:58 +00:00
qfontcache Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
qfontdatabase Updated license headers 2016-01-21 18:55:18 +00:00
qfontmetrics Updated license headers 2016-01-21 18:55:18 +00:00
qglyphrun Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qrawfont Updated license headers 2016-01-21 18:55:18 +00:00
qstatictext Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00
qsyntaxhighlighter Updated license headers 2016-01-21 18:55:18 +00:00
qtextblock Updated license headers 2016-01-21 18:55:18 +00:00
qtextcursor Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qtextdocument Interpret fixed CSS line-height as minimum rather than absolute 2016-04-19 09:32:10 +00:00
qtextdocumentfragment Updated license headers 2016-01-21 18:55:18 +00:00
qtextdocumentlayout Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
qtextformat Updated license headers 2016-01-21 18:55:18 +00:00
qtextlayout Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
qtextlist Updated license headers 2016-01-21 18:55:18 +00:00
qtextobject Updated license headers 2016-01-21 18:55:18 +00:00
qtextodfwriter Updated license headers 2016-01-21 18:55:18 +00:00
qtextpiecetable Updated license headers 2016-01-21 18:55:18 +00:00
qtextscriptengine Enable some tests previously disabled due to different results with HB-NG 2016-04-29 16:25:46 +00:00
qtexttable Updated license headers 2016-01-21 18:55:18 +00:00
qzip Updated license headers 2016-01-21 18:55:18 +00:00
text.pro Enable most of tst_qstatictext on non-developer builds 2016-03-10 15:45:41 +00:00