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
..
data	Markdown importer: properly set hyperlinks	2020-02-03 14:58:06 +01:00
BLACKLIST	unblacklist passing tests	2019-07-08 11:01:42 +00:00
CMakeLists.txt	cmake: add tests/auto/gui/text	2019-11-01 13:28:59 +00:00
qtextmarkdownwriter.pro	Markdown: blockquotes, code blocks, and generalized nesting	2019-05-08 20:28:53 +00:00
tst_qtextmarkdownwriter.cpp	Markdown importer: properly set hyperlinks	2020-02-03 14:58:06 +01:00