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
..
moc	moc: Extend revision markers to allow for major and minor version	2020-02-07 21:23:55 +01:00
qdbuscpp2xml	Regenerate tests/auto/tools	2019-11-12 17:25:41 +00:00
qdbusxml2cpp	Regenerate tests/auto/tools	2019-11-12 17:25:41 +00:00
qmake	Regenerate Tests	2020-01-16 08:16:17 +00:00
qmakelib	Regenerate tests/auto/tools	2019-11-12 17:25:41 +00:00
rcc	rcc: Add -d option to output a Makefile-syntax depfile	2019-06-29 02:26:23 +02:00
uic	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
CMakeLists.txt	Fix for getting windows running tests	2019-09-17 17:11:59 +00:00
tools.pro	add test for the qmake library	2015-02-25 13:54:33 +00:00