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, 15 insertions, 2 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() );