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
..
BLACKLIST	Merge remote-tracking branch 'origin/5.12' into dev	2019-01-04 07:33:14 +01:00
qglyphrun.pro	QtGui: Remove Windows CE.	2016-03-30 17:35:41 +00:00
testdata.qrc	QStyleSheetStyle: Don't interfere with QFontDialog	2014-10-24 16:59:26 +02:00
tst_qglyphrun.cpp	Remove QEXPECT_FAIL from test on macOS	2018-10-10 08:24:01 +00:00