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
..
stream	Fix invalid QDataStream data for QDateTime	2016-05-26 11:05:43 +00:00
.gitignore	Moving relevant tests to corelib/kernel	2011-09-01 12:42:14 +02:00
.prev_CMakeLists.txt	Regenerate tests/auto/corelib/kernel	2019-11-12 17:25:04 +00:00
CMakeLists.txt	Regenerate tests/auto/corelib/kernel	2019-11-12 17:25:04 +00:00
qvariant.pro	Introduce QT_NO_LINKED_LIST and mark QtBase (almost) free of it	2019-07-12 14:26:30 +02:00
qvariant.qrc	Cleanup mess in public type ids.	2012-01-25 21:08:08 +01:00
tst_qvariant.cpp	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00