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
..
image	Merge "Merge remote-tracking branch 'origin/5.12' into dev" into refs/staging/dev	2018-12-13 02:30:54 +00:00
itemmodels	Fix use of deprecated ItemDataRoles Background/TextColorRole	2018-11-05 21:58:37 +00:00
kernel	Fix and unit test QPalette::resolve	2018-12-31 14:30:26 +00:00
math3d	Use qRadiansToDegrees() and qDegreesToRadians() more widely	2017-07-05 10:15:34 +00:00
painting	Avoid crash in blitting or fast draw when QPointF is too big	2018-12-11 18:32:53 +00:00
qopengl	Implement support for 16bpc image formats	2018-08-11 14:12:48 +00:00
qopenglconfig	Fix tst_QOpenGlConfig for platforms with builtin test data	2017-06-19 07:05:59 +00:00
qvulkan	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
text	Merge remote-tracking branch 'origin/5.12' into dev	2019-01-04 07:33:14 +01:00
util	Texture file support: add mipmap reading to ktx handler	2018-09-12 08:41:38 +00:00
gui.pro	winrt: Skip/blacklist failing opengl tests	2018-05-28 08:36:55 +00:00