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

4 files changed, 51 insertions, 4 deletions

diff --git a/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
index 8e6ca486d5..758aeb42b9 100644
--- a/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
+++ b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
@@ -42,6 +42,19 @@ class TstWidget;
 class TstDialog;
 QT_FORWARD_DECLARE_CLASS(QPushButton)
 
+class TestButton : public QPushButton
+{
+public:
+    TestButton(const QString &title, QWidget *parent = nullptr)
+    : QPushButton(title, parent)
+    {}
+protected:
+    bool hitButton(const QPoint &pos) const override
+    {
+        return rect().contains(pos);
+    }
+};
+
 class tst_qmouseevent_modal : public QObject
 {
     Q_OBJECT
@@ -63,7 +76,7 @@ public:
 public slots:
     void buttonPressed();
 public:
-    QPushButton *pb;
+    TestButton *pb;
     TstDialog *d;
 };
 
@@ -135,7 +148,7 @@ void tst_qmouseevent_modal::mousePressRelease()
 
 TstWidget::TstWidget()
 {
-    pb = new QPushButton( "Press me", this );
+    pb = new TestButton( "Press me", this );
     pb->setObjectName("testbutton");
     QSize s = pb->sizeHint();
     pb->setGeometry( 5, 5, s.width(), s.height() );
diff --git a/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp b/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp
index 945a4772f3..99fb3d3e72 100644
--- a/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp
+++ b/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp
@@ -413,6 +413,7 @@ void tst_QColorSpace::primaries2()
 
 void tst_QColorSpace::invalidPrimaries()
 {
+    QTest::ignoreMessage(QtWarningMsg, QRegularExpression("QColorSpace attempted constructed from invalid primaries"));
     QColorSpace custom(QPointF(), QPointF(), QPointF(), QPointF(), QColorSpace::TransferFunction::Linear);
     QVERIFY(!custom.isValid());
 }
@@ -444,8 +445,15 @@ void tst_QColorSpace::changeTransferFunction()
 
     QColorSpace undefined;
     QCOMPARE(undefined.withTransferFunction(QColorSpace::TransferFunction::Linear), undefined);
-    undefined.setTransferFunction(QColorSpace::TransferFunction::SRgb);
-    QCOMPARE(undefined, QColorSpace());
+
+    QColorSpace partial;
+    partial.setTransferFunction(QColorSpace::TransferFunction::SRgb);
+    QCOMPARE(partial.transferFunction(), QColorSpace::TransferFunction::SRgb);
+    QVERIFY(!partial.isValid());
+
+    partial.setPrimaries(QColorSpace::Primaries::SRgb);
+    QVERIFY(partial.isValid());
+    QCOMPARE(partial, QColorSpace(QColorSpace::SRgb));
 }
 
 void tst_QColorSpace::changePrimaries()
diff --git a/tests/auto/gui/text/qtextmarkdownwriter/data/links.md b/tests/auto/gui/text/qtextmarkdownwriter/data/links.md
new file mode 100644
index 0000000000..33cdb2b3ab
--- /dev/null
+++ b/tests/auto/gui/text/qtextmarkdownwriter/data/links.md
@@ -0,0 +1,25 @@
+A series of links.
+
+[link](/uri)
+
+[link]()
+
+[link](/uri "title")
+
+[link](/uri "àbcdè")
+
+[link](/uri "title title \" title title")
+
+[link](/url "title \""")
+
+[link](/url "title
+title
+title title
+\"title\" title \"
+title")
+
+* [link](/url "title")
+* [link](/url)
+* [link](/url "title
+title title")
+* nonlink
diff --git a/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp b/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp
index d15e856a20..31592c7f0f 100644
--- a/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp
+++ b/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp
@@ -368,6 +368,7 @@ void tst_QTextMarkdownWriter::rewriteDocument_data()
     QTest::newRow("example") << "example.md";
     QTest::newRow("list items after headings") << "headingsAndLists.md";
     QTest::newRow("word wrap") << "wordWrap.md";
+    QTest::newRow("links") << "links.md";
 }
 
 void tst_QTextMarkdownWriter::rewriteDocument()