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	Doc: Add formatting features to Notepad example	2018-06-01 09:54:56 +00:00
.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
main.cpp	Doc: move notepad example to qtbase and improve it	2017-12-18 13:39:28 +00:00
notepad.cpp	Examples: fix compile without printsupport	2020-01-31 06:23:58 +01:00
notepad.h	Cleanup QtWidgets examples	2019-10-11 06:32:30 +02:00
notepad.pro	examples: Fix notepad example for configurations without printsupport	2018-01-22 08:27:26 +00:00
notepad.qrc	Doc: Add formatting features to Notepad example	2018-06-01 09:54:56 +00:00
notepad.ui	Doc: Add formatting features to Notepad example	2018-06-01 09:54:56 +00:00