1 files changed, 51 insertions, 0 deletions
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index 1cdf39018b..8d1ea3b510 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -146,6 +146,7 @@ private slots:
     void connectFunctorOverloads();
     void disconnectDoesNotLeakFunctor();
     void connectBase();
+    void qmlConnect();
 };
 
 struct QObjectCreatedOnShutdown
@@ -5879,6 +5880,56 @@ void tst_QObject::connectBase()
     QCOMPARE( r1.count_slot3, 1 );
 }
 
+struct QmlReceiver : public QtPrivate::QSlotObjectBase
+{
+    int callCount;
+    void *magic;
+
+    QmlReceiver()
+        : QtPrivate::QSlotObjectBase(&impl)
+        , callCount(0)
+        , magic(0)
+    {}
+
+    static void impl(int which, QSlotObjectBase *this_, QObject *, void **metaArgs, bool *ret)
+    {
+        switch (which) {
+        case Destroy: delete static_cast<QmlReceiver*>(this_); return;
+        case Call: static_cast<QmlReceiver*>(this_)->callCount++; return;
+        case Compare: *ret = static_cast<QmlReceiver*>(this_)->magic == metaArgs[0]; return;
+        case NumOperations: break;
+        }
+    }
+};
+
+void tst_QObject::qmlConnect()
+{
+#ifdef QT_BUILD_INTERNAL
+    SenderObject sender;
+    QmlReceiver *receiver = new QmlReceiver;
+    receiver->magic = receiver;
+    receiver->ref();
+
+    QVERIFY(QObjectPrivate::connect(&sender, sender.metaObject()->indexOfSignal("signal1()"),
+                                    receiver, Qt::AutoConnection));
+
+    QCOMPARE(receiver->callCount, 0);
+    sender.emitSignal1();
+    QCOMPARE(receiver->callCount, 1);
+
+    void *a[] = {
+        receiver
+    };
+    QVERIFY(QObjectPrivate::disconnect(&sender, sender.metaObject()->indexOfSignal("signal1()"), reinterpret_cast<void**>(&a)));
+
+    sender.emitSignal1();
+    QCOMPARE(receiver->callCount, 1);
+
+    receiver->destroyIfLastRef();
+#else
+    QSKIP("Needs QT_BUILD_INTERNAL");
+#endif
+}
 
 QTEST_MAIN(tst_QObject)
 #include "tst_qobject.moc"