Liang Qi 6b2535ea15 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: examples/widgets/graphicsview/boxes/scene.h src/corelib/Qt5CoreMacros.cmake src/corelib/Qt6CoreMacros.cmake src/network/ssl/qsslsocket.cpp src/network/ssl/qsslsocket.h src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp src/testlib/CMakeLists.txt src/testlib/.prev_CMakeLists.txt tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp Disabled building manual tests with CMake for now, because qmake doesn't do it, and it confuses people. Done-With: Alexandru Croitor <alexandru.croitor@qt.io> Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io> Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152		2020-02-13 18:31:40 +01:00
..
image	Merge remote-tracking branch 'origin/dev' into wip/cmake	2020-01-29 16:57:27 +01:00
itemmodels	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
kernel	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
math3d	Merge remote-tracking branch 'origin/dev' into wip/cmake	2020-01-29 16:57:27 +01:00
painting	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
qopengl	Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"	2020-02-07 18:19:51 +00:00
qopenglconfig	Port qopengl and qopenglconfig tests	2019-10-28 12:04:59 +00:00
qvulkan	Convert qvulkan test	2019-10-28 12:05:17 +00:00
rhi	Merge remote-tracking branch 'origin/dev' into wip/cmake	2020-01-29 16:57:27 +01:00
text	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
util	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
.prev_CMakeLists.txt	Regenerate some of the test projects that do SUBDIRS += foo	2019-08-07 11:55:38 +00:00
CMakeLists.txt	cmake: add tests/auto/gui/text	2019-11-01 13:28:59 +00:00
gui.pro	Introduce the Qt graphics abstraction as private QtGui helpers	2019-06-13 10:13:45 +02:00