From d08f8c2109456ae236eedc359fab4561fb613c6a Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Wed, 31 Mar 2021 16:02:19 +0200
Subject: QV4QObjectWrapper: Store the whole signal

90be89d771425044a84e9e79e4e668e065acc825 changed the connection logic to
actually pass the receiver to connect in order to fix disconnect
cleanup. However, we omitted to change QObjectSlotDispatcher::impl
accordingly. The previous logic was:
- store the index of the signal in signalIndex
- In impl, in the call case, we would get passed the emitting object
  (sic!) as the receiver parameter. Then we would use the object and the
  signal index to obtain the QMetaMethod.
- From the QMetaMethod, we could get the signal's number of parameters.

After the aforementioned change, that does not work anymore: The
receiver is now the actual receiver of the signal, thus we get the wrong
method, and potentially the wrong number of parameters.
To fix this, we now store the complete QMetaMethod of the signal.

Change-Id: I868c51edf24a61d14eaf958ed7942da27f54a5c3
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit e7e4eba6875c0f375c4fd03af9b3ed9ea44d0ba1)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 tests/auto/qml/qqmlecmascript/data/scriptConnect.7.qml | 11 +++++++++++
 tests/auto/qml/qqmlecmascript/testtypes.cpp            |  3 +++
 tests/auto/qml/qqmlecmascript/testtypes.h              | 14 ++++++++++++++
 tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp   |  8 ++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 tests/auto/qml/qqmlecmascript/data/scriptConnect.7.qml

(limited to 'tests')

diff --git a/tests/auto/qml/qqmlecmascript/data/scriptConnect.7.qml b/tests/auto/qml/qqmlecmascript/data/scriptConnect.7.qml
new file mode 100644
index 0000000000..9dab8d7815
--- /dev/null
+++ b/tests/auto/qml/qqmlecmascript/data/scriptConnect.7.qml
@@ -0,0 +1,11 @@
+import Qt.test
+import QtQml
+
+QtObject {
+    readonly property Sender s: Sender {id: sender}
+    readonly property Receiver r: Receiver {id: receiver}
+    Component.onCompleted: () => {
+        sender.sig1.connect(receiver.slot1)
+        sender.sig1()
+    }
+}
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.cpp b/tests/auto/qml/qqmlecmascript/testtypes.cpp
index 688ed2c946..9b699f485b 100644
--- a/tests/auto/qml/qqmlecmascript/testtypes.cpp
+++ b/tests/auto/qml/qqmlecmascript/testtypes.cpp
@@ -556,6 +556,9 @@ void registerTypes()
 
     qmlRegisterType<ClassWithQProperty>("Qt.test", 1, 0, "ClassWithQProperty");
     qmlRegisterType<ClassWithQProperty2>("Qt.test", 1, 0, "ClassWithQProperty2");
+
+    qmlRegisterType<Receiver>("Qt.test", 1,0, "Receiver");
+    qmlRegisterType<Sender>("Qt.test", 1,0, "Sender");
 }
 
 #include "testtypes.moc"
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h
index 7074ffaa10..09c3fcaf40 100644
--- a/tests/auto/qml/qqmlecmascript/testtypes.h
+++ b/tests/auto/qml/qqmlecmascript/testtypes.h
@@ -1781,6 +1781,20 @@ public:
     // QNotifiedProperty<float, &ClassWithQProperty2::callback> value;
 };
 
+struct Sender : QObject
+{
+    Q_OBJECT
+signals:
+    void sig1();
+};
+
+struct Receiver : QObject
+{
+    Q_OBJECT
+public slots:
+    int slot1(int i, int j, int k) {return i+j+k;}
+};
+
 void registerTypes();
 
 #endif // TESTTYPES_H
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 1ac1c04fd4..59f2b1ab88 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -3617,6 +3617,14 @@ void tst_qqmlecmascript::scriptConnect()
 
         delete object;
     }
+
+    {
+        QRegularExpression msg {".*scriptConnect.7.qml:9: Error: Insufficient arguments"};
+        QTest::ignoreMessage(QtMsgType::QtWarningMsg, msg);
+        QQmlComponent component(&engine, testFileUrl("scriptConnect.7.qml"));
+        QScopedPointer<QObject> root { component.create() };
+        QVERIFY2(root, qPrintable(component.errorString()));
+    }
 }
 
 void tst_qqmlecmascript::scriptDisconnect()
-- 
cgit v1.2.3