qt5base-lts/examples/widgets/graphicsview/chip
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
..
.prev_CMakeLists.txt Regenerate examples 2020-02-04 18:50:39 +00:00
chip.cpp Widgets/GraphicsView examples: cleanup 2019-09-05 17:40:36 +02:00
chip.h Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
chip.pro Remove deprecated QGL* classes 2019-12-11 11:53:15 +01:00
CMakeLists.txt Regenerate examples 2020-02-04 18:50:39 +00:00
fileprint.png Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
images.qrc Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
main.cpp Updated license headers 2016-01-21 18:55:32 +00:00
mainwindow.cpp Widgets/GraphicsView examples: cleanup 2019-09-05 17:40:36 +02:00
mainwindow.h Widgets/GraphicsView examples: cleanup 2019-09-05 17:40:36 +02:00
qt4logo.png Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
rotateleft.png Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
rotateright.png Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
view.cpp Merge remote-tracking branch 'origin/5.15' into dev 2020-02-13 18:31:40 +01:00
view.h Remove deprecated QGL* classes 2019-12-11 11:53:15 +01:00
zoomin.png Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
zoomout.png Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00