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
..
images	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
CMakeLists.txt	Regenerate examples	2020-02-04 18:50:39 +00:00
draggableicons.pro	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
draggableicons.qrc	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
dragwidget.cpp	Examples: Replace deprecated QLabel API	2020-02-01 07:31:01 +08:00
dragwidget.h	Revamp QtWidgets/DragAndDrop examples to C++11	2017-10-18 10:31:44 +00:00
main.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00