Liang Qi 153e8b49ad Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: src/network/access/qhttp2protocolhandler_p.h src/network/kernel/kernel.pri src/network/ssl/qsslkey_qt.cpp src/plugins/platforms/cocoa/qcocoascreen.mm src/plugins/platforms/windows/accessible/iaccessible2.cpp src/plugins/platforms/windows/accessible/iaccessible2.h src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h src/widgets/widgets/qmenu_p.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/other/qaccessibility/tst_qaccessibility.cpp tests/auto/testlib/selftests/expected_cmptest.lightxml tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/testlib/selftests/expected_cmptest.xml Done-with: Edward Welbourne <edward.welbourne@qt.io> Change-Id: I4217cc7d840cbae3e3dd28574741544469c4c6b9		2017-11-23 09:36:03 +01:00
..
qabstracttextdocumentlayout	Make imageAt and formatAt more robus against different font metrics	2016-08-12 03:59:23 +00:00
qcssparser	Remove references to obsolete platforms	2017-11-05 06:33:53 +00:00
qfont	Blacklist tst_QFont::DefaultFamily in B2Qt	2017-08-16 07:32:09 +00:00
qfontcache	Avoid synthesizing stretch on condensed font families	2016-08-15 11:39:44 +00:00
qfontdatabase	Ensure that tst_QFontDatabase::addAppFont() tests the whole path to an engine	2017-03-31 09:45:39 +00:00
qfontmetrics	Add QFontMetrics(F)::horizontalAdvance() function	2017-11-14 16:28:45 +00:00
qglyphrun	Accept error margin in QGlyphRun/QStaticText test for decorations	2017-02-02 15:10:41 +00:00
qinputcontrol	Accept all formatting characters as valid input	2017-01-26 10:59:49 +00:00
qrawfont	Added capHeight() to QRawFont and QFontMetrics(F)	2016-08-15 18:27:06 +00:00
qstatictext	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00: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	Fix CSS line-height property multiplier value handling	2017-04-21 07:10:51 +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	QTextFormatCollection: replace copy ctor and op= with clear()	2017-02-23 18:11:55 +00:00
qtextlayout	Add QTextOption/QTextEdit/QPlainTextEdit::tabStopDistance property	2017-08-06 08:16:06 +00: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	Change almost all other uses of qrand() to QRandomGenerator	2017-11-08 09:14:03 +00:00
qtextscriptengine	Revert "Ignore thaiZWJ failure on RHEL 7.2"	2017-08-07 07:18:26 +00:00
qtexttable	Updated license headers	2016-01-21 18:55:18 +00:00
qzip	update testdata	2016-08-31 10:00:29 +00:00
text.pro	Build examples and tests only if their requirements are met	2017-03-22 15:55:55 +00:00