Merge remote-tracking branch 'origin/5.9' into 5.105.10

 Conflicts:
	.qmake.conf

Change-Id: Id5d79a1cd456c79ef35a323d1a8713facde2ef91

1 files changed, 12 insertions, 1 deletions

diff --git a/tests/auto/webchannel/tst_webchannel.h b/tests/auto/webchannel/tst_webchannel.h
index d2597e5..85a9f39 100644
--- a/tests/auto/webchannel/tst_webchannel.h
+++ b/tests/auto/webchannel/tst_webchannel.h
@@ -31,6 +31,7 @@
 
 #include <QObject>
 #include <QVariant>
+#include <QVector>
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
@@ -53,10 +54,18 @@ public:
         emit messageReceived(message, this);
     }
 
+    QVector<QJsonObject> messagesSent() const
+    {
+        return mMessagesSent;
+    }
+
 public slots:
-    void sendMessage(const QJsonObject &/*message*/) Q_DECL_OVERRIDE
+    void sendMessage(const QJsonObject &message) Q_DECL_OVERRIDE
     {
+        mMessagesSent.push_back(message);
     }
+private:
+    QVector<QJsonObject> mMessagesSent;
 };
 
 class TestObject : public QObject
@@ -296,6 +305,8 @@ private slots:
     void testPassWrappedObjectBack();
     void testInfiniteRecursion();
     void testAsyncObject();
+    void testDeletionDuringMethodInvocation_data();
+    void testDeletionDuringMethodInvocation();
 
     void benchClassInfo();
     void benchInitializeClients();