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
..
.gitignore	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00
.prev_CMakeLists.txt	Post Merge Fixes	2020-01-24 12:29:18 +00:00
CMakeLists.txt	Regenerate Tests	2020-01-16 08:16:17 +00:00
datastream.q42	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00
qdatastream.pro	Fix qmake builds	2019-12-11 20:57:54 +00:00
testdata.qrc	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00
tst_qdatastream.cpp	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00