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
..
dialogs	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
effects	Regenerate tests/auto/widgets/effects	2019-11-13 10:06:06 +00:00
graphicsview	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
itemviews	Merge remote-tracking branch 'origin/wip/cmake' into dev	2020-02-03 15:01:53 +00:00
kernel	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
styles	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
util	QComboBox: remove deprecated signals	2020-02-10 18:28:45 +01:00
widgets	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
CMakeLists.txt	Begin port of qtbase to CMake	2018-11-01 11:48:46 +00:00
widgets.pro	Move QGestureRecognizer test to widgets/kernel	2017-06-02 18:36:11 +00:00