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
..
CMakeLists.txt	Regenerate examples	2020-02-04 18:50:39 +00:00
dialog.cpp	Deprecate one overload of QInputDialog::getDouble() for 5.15	2020-02-12 16:10:24 +01:00
dialog.h	Cleanup QtWidgets examples	2019-10-11 06:32:30 +02:00
main.cpp	Prepare for deprecating the QDesktopWidget	2019-10-15 20:09:29 +02:00
standarddialogs.pro	qtlite: Skip building examples when configured with no-feature-itemviews	2018-01-12 07:58:20 +00:00