qt5base-lts/BLACKLIST at b1004c7d0a5d7abbacd687fd41a5b2683e62b27d - qt5base-lts - Gitea: Git with a cup of tea

AuroraMiddleware/qt5base-lts

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

5 lines

41 B

Plaintext

Raw Blame History

 [mixedScripts]
 ubuntu-18.04
 b2qt
 windows