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
..
qstate	Regenerate tests/auto/corelib/statemachine	2019-11-12 17:27:21 +00:00
qstatemachine	std::chrono overload added to QStateMachine::postDelayedEvent()	2020-02-10 15:04:39 +01:00
CMakeLists.txt	Begin port of qtbase to CMake	2018-11-01 11:48:46 +00:00
statemachine.pro	Moving relevant tests to corelib/statemachine	2011-09-01 12:54:42 +02:00