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

1 files changed, 108 insertions, 0 deletions

diff --git a/tests/auto/testlib/selftests/expected_globaldata.junitxml b/tests/auto/testlib/selftests/expected_globaldata.junitxml
new file mode 100644
index 0000000000..de184c2fdd
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_globaldata.junitxml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite errors="43" failures="0" tests="6" name="tst_globaldata">
+  <properties>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
+    <property value="" name="QtBuild"/>
+  </properties>
+  <testcase result="pass" name="initTestCase">
+    <!-- message="initTestCase initTestCase (null)" type="qdebug" -->
+  </testcase>
+  <testcase result="pass" name="testGlobal">
+    <!-- tag="global=false:local=false" message="init testGlobal local=false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="global: false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="local: false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="cleanup testGlobal local=false" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="init testGlobal local=true" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="global: false" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="local: true" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="cleanup testGlobal local=true" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="init testGlobal local=false" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="global: true" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="local: false" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="cleanup testGlobal local=false" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="init testGlobal local=true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="global: true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="local: true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="cleanup testGlobal local=true" type="qdebug" -->
+  </testcase>
+  <testcase name="skip">
+    <!-- tag="global=false" message="skipping" type="skip" -->
+  </testcase>
+  <testcase name="skipLocal">
+    <!-- tag="global=false:local=false" message="init skipLocal local=false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="skipping" type="skip" -->
+    <!-- tag="global=false:local=false" message="cleanup skipLocal local=false" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="init skipLocal local=true" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="skipping" type="skip" -->
+    <!-- tag="global=false:local=true" message="cleanup skipLocal local=true" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="init skipLocal local=false" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="skipping" type="skip" -->
+    <!-- tag="global=true:local=false" message="cleanup skipLocal local=false" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="init skipLocal local=true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="skipping" type="skip" -->
+    <!-- tag="global=true:local=true" message="cleanup skipLocal local=true" type="qdebug" -->
+  </testcase>
+  <testcase result="pass" name="skipSingle">
+    <!-- tag="global=false:local=false" message="init skipSingle local=false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="global: false local: false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="cleanup skipSingle local=false" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="init skipSingle local=true" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="Skipping" type="skip" -->
+    <!-- tag="global=false:local=true" message="cleanup skipSingle local=true" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="init skipSingle local=false" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="Skipping" type="skip" -->
+    <!-- tag="global=true:local=false" message="cleanup skipSingle local=false" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="init skipSingle local=true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="global: true local: true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="cleanup skipSingle local=true" type="qdebug" -->
+  </testcase>
+  <testcase result="pass" name="cleanupTestCase">
+    <!-- message="cleanupTestCase cleanupTestCase (null)" type="qdebug" -->
+  </testcase>
+  <system-err>
+<![CDATA[initTestCase initTestCase (null)]]>
+<![CDATA[init testGlobal local=false]]>
+<![CDATA[global: false]]>
+<![CDATA[local: false]]>
+<![CDATA[cleanup testGlobal local=false]]>
+<![CDATA[init testGlobal local=true]]>
+<![CDATA[global: false]]>
+<![CDATA[local: true]]>
+<![CDATA[cleanup testGlobal local=true]]>
+<![CDATA[init testGlobal local=false]]>
+<![CDATA[global: true]]>
+<![CDATA[local: false]]>
+<![CDATA[cleanup testGlobal local=false]]>
+<![CDATA[init testGlobal local=true]]>
+<![CDATA[global: true]]>
+<![CDATA[local: true]]>
+<![CDATA[cleanup testGlobal local=true]]>
+<![CDATA[skipping]]>
+<![CDATA[init skipLocal local=false]]>
+<![CDATA[skipping]]>
+<![CDATA[cleanup skipLocal local=false]]>
+<![CDATA[init skipLocal local=true]]>
+<![CDATA[skipping]]>
+<![CDATA[cleanup skipLocal local=true]]>
+<![CDATA[init skipLocal local=false]]>
+<![CDATA[skipping]]>
+<![CDATA[cleanup skipLocal local=false]]>
+<![CDATA[init skipLocal local=true]]>
+<![CDATA[skipping]]>
+<![CDATA[cleanup skipLocal local=true]]>
+<![CDATA[init skipSingle local=false]]>
+<![CDATA[global: false local: false]]>
+<![CDATA[cleanup skipSingle local=false]]>
+<![CDATA[init skipSingle local=true]]>
+<![CDATA[Skipping]]>
+<![CDATA[cleanup skipSingle local=true]]>
+<![CDATA[init skipSingle local=false]]>
+<![CDATA[Skipping]]>
+<![CDATA[cleanup skipSingle local=false]]>
+<![CDATA[init skipSingle local=true]]>
+<![CDATA[global: true local: true]]>
+<![CDATA[cleanup skipSingle local=true]]>
+<![CDATA[cleanupTestCase cleanupTestCase (null)]]>
+  </system-err>
+</testsuite>