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
.prev_CMakeLists.txt	Regenerate examples	2020-02-04 18:50:39 +00:00
CMakeLists.txt	Regenerate examples	2020-02-04 18:50:39 +00:00
imagemodel.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
imagemodel.h	Examples: Replace 'Q_DECL_OVERRIDE' by 'override'	2016-06-15 09:32:30 +00:00
images.qrc
main.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
mainwindow.cpp	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
mainwindow.h	Unify license header usage.	2016-03-29 10:20:03 +00:00
pixelator.pro	qtlite: Skip building examples when configured with no-feature-itemviews	2018-01-12 07:58:20 +00:00
pixeldelegate.cpp	Cleanup Itemviews examples	2018-12-17 19:50:38 +00:00
pixeldelegate.h	Cleanup Itemviews examples	2018-12-17 19:50:38 +00:00