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

 Conflicts:
	.qmake.conf

Change-Id: Id5d79a1cd456c79ef35a323d1a8713facde2ef91

2 files changed, 64 insertions, 1 deletions

diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp
index a44220f..436a38e 100644
--- a/tests/auto/webchannel/tst_webchannel.cpp
+++ b/tests/auto/webchannel/tst_webchannel.cpp
@@ -814,6 +814,58 @@ void TestWebChannel::testAsyncObject()
     thread.wait();
 }
 
+class FunctionWrapper : public QObject
+{
+    Q_OBJECT
+    std::function<void()> m_fun;
+public:
+    FunctionWrapper(std::function<void()> fun) : m_fun(std::move(fun)) {}
+public slots:
+    void invoke()
+    {
+        m_fun();
+    }
+};
+
+void TestWebChannel::testDeletionDuringMethodInvocation_data()
+{
+    QTest::addColumn<bool>("deleteChannel");
+    QTest::addColumn<bool>("deleteTransport");
+    QTest::newRow("delete neither")   << false << false;
+    QTest::newRow("delete channel")   << true  << false;
+    QTest::newRow("delete transport") << false << true;
+    QTest::newRow("delete both")      << true  << true;
+}
+
+void TestWebChannel::testDeletionDuringMethodInvocation()
+{
+    QFETCH(bool, deleteChannel);
+    QFETCH(bool, deleteTransport);
+
+    QScopedPointer<QWebChannel> channel(new QWebChannel);
+    QScopedPointer<DummyTransport> transport(new DummyTransport(nullptr));
+    FunctionWrapper deleter([&](){
+        if (deleteChannel)
+            channel.reset();
+        if (deleteTransport)
+            transport.reset();
+    });
+    channel->registerObject("deleter", &deleter);
+    channel->connectTo(transport.data());
+
+    transport->emitMessageReceived({
+        {"type", TypeInvokeMethod},
+        {"object", "deleter"},
+        {"method", deleter.metaObject()->indexOfMethod("invoke()")},
+        {"id", 42}
+    });
+
+    QCOMPARE(deleteChannel, !channel);
+    QCOMPARE(deleteTransport, !transport);
+    if (!deleteTransport)
+        QCOMPARE(transport->messagesSent().size(), deleteChannel ? 0 : 1);
+}
+
 static QHash<QString, QObject*> createObjects(QObject *parent)
 {
     const int num = 100;
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();