Liang Qi 44c393f9b6 Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: config.tests/arch/write_info.pri Repair architecture config test for the WASM_OBJECT_FILES=1 build mode configure.pri tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp Done-With: Jörg Bornemann <joerg.bornemann@qt.io> Change-Id: I9e12088356eb5bc65b53211cd7a8e330cccd1bb4		2019-08-12 13:23:11 +02:00
..
image	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-06-20 07:50:44 +02:00
itemmodels	Fix use of deprecated ItemDataRoles Background/TextColorRole	2018-11-05 21:58:37 +00:00
kernel	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-08-12 13:23:11 +02:00
math3d	Use qRadiansToDegrees() and qDegreesToRadians() more widely	2017-07-05 10:15:34 +00:00
painting	BLACKLIST contains_QPointF for msvc-2019	2019-08-08 15:20:23 +03:00
qopengl	Fix OpenGL ES2 build on Linux	2019-02-15 12:58:12 +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 5.13	2019-08-12 13:23:11 +02:00
util	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-03 10:44:24 +02:00
gui.pro	winrt: Skip/blacklist failing opengl tests	2018-05-28 08:36:55 +00:00