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
..
baseline	uic/Python: Add imports for Q(Date)Time, QKeySequence	2020-02-06 17:46:21 +01:00
.gitignore
CMakeLists.txt	Regenerate tests/auto/tools	2019-11-12 17:25:41 +00:00
tst_uic.cpp	uic: Extend the baseline test for Python	2020-01-07 13:33:14 +01:00
uic.pro	uic-Autotest: Remove SRCDIR-define, add stdout-test.	2012-08-02 20:38:54 +02:00