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
aircraft.png	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
CMakeLists.txt	Regenerate examples	2020-02-04 18:50:39 +00:00
flightinfo.cpp	Merge remote-tracking branch 'origin/5.14' into 5.15	2020-02-04 10:44:00 +01:00
flightinfo.pro	centralize and fixup example sources install targets	2012-11-29 20:21:11 +01:00
flightinfo.qrc	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
form.ui	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00