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
BLACKLIST	Update for failures only on dev branch. Use general platform names	2019-08-19 18:22:11 +02:00
CMakeLists.txt	cmake: add more tests in corelib/thread	2019-10-04 06:27:19 +00:00
qthreadpool.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qthreadpool.cpp	Add a constructor for QRunnable from anonymous functions	2020-01-31 19:20:43 +01:00