Liang Qi 03039979b5 Merge remote-tracking branch 'origin/5.12' into dev ... Also blacklist tst_QRawFont::unsupportedWritingSystem() and tst_QGlyphRun::mixedScripts() on windows for now. Conflicts: qmake/generators/makefile.cpp src/corelib/itemmodels/qstringlistmodel.cpp src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp tests/auto/gui/text/qglyphrun/BLACKLIST tests/auto/gui/text/qrawfont/BLACKLIST Task-number: QTBUG-72836 Change-Id: I10fea1493f0ae1a5708e1e48d0a4d7d6b76258b9		2019-01-04 07:33:14 +01:00
..
ipc	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
mimetypes	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-20 22:36:19 +01:00
serialization	Implement QDataStream operator for QCborSimpleValue	2018-10-03 14:49:27 +00:00
threads	Doc: cleanup semaphore example	2019-01-03 11:37:22 +00:00
tools	Doc: Add missing full stops in briefs	2018-06-21 14:23:30 +00:00
corelib.pro	threads: disable threads examples for nothread builds	2018-12-10 05:36:08 +00:00