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
..
client.cpp	QLocalSocket: Deprecate 'error' signal, use 'errorOccurred' instead	2020-02-11 16:54:59 +03:00
client.h	Cleanup QtCore examples	2019-02-06 22:11:27 +00:00
CMakeLists.txt	Regenerate examples	2020-02-04 18:50:39 +00:00
localfortuneclient.pro
main.cpp	Modernize the Local Fortune Client and Server examples	2017-09-22 14:51:48 +00:00