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
..
mac	Xcode: Use output directory as SYMROOT when shadow-building	2019-12-12 14:56:31 +01:00
unix	Mark the old style unprefixed stream functions deprecated	2019-12-16 11:23:47 +01:00
win32	Merge remote-tracking branch 'origin/5.14' into 5.15	2020-02-04 10:44:00 +01:00
makefile.cpp	Purge the dep_cd_cmd parameter from callExtraCompilerDependCommand	2020-01-24 13:25:06 +01:00
makefile.h	Purge the dep_cd_cmd parameter from callExtraCompilerDependCommand	2020-01-24 13:25:06 +01:00
makefiledeps.cpp	Fix developer build with -Werror	2019-10-15 10:46:06 +00:00
makefiledeps.h	Fix developer build with -Werror	2019-10-15 10:46:06 +00:00
metamakefile.cpp	qmake: Avoid writing glue project file when only generating prl files	2019-10-09 02:10:03 +02:00
metamakefile.h	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
projectgenerator.cpp	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-09-04 07:03:54 +02:00
projectgenerator.h	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-14 13:45:18 +02:00
xmloutput.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-08-16 01:00:33 +02:00
xmloutput.h	Updated license headers	2016-01-21 18:55:18 +00:00