From 6afc3be37712416aa56940848aebe7682ad9e88f Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Fri, 15 Jun 2012 11:47:56 +0200 Subject: Implement QAbstractDeclarativeData::isSignalConnected hook QQml_isSignalConnected is no longer needed, since QObjectPrivate::isSignalConnected will now call the declarativeData hook. Change-Id: I0685b0fa909d6c6c2d275bfa8d41100d9926a046 Reviewed-by: Michael Brasser Reviewed-by: Chris Adams --- tests/auto/qml/qqmllanguage/testtypes.h | 5 +++++ tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'tests') diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h index 01f26c7f67..450abebad4 100644 --- a/tests/auto/qml/qqmllanguage/testtypes.h +++ b/tests/auto/qml/qqmllanguage/testtypes.h @@ -643,10 +643,15 @@ public: int mySignalCount() { return receivers(SIGNAL(mySignal())); } int propChangedCount() { return receivers(SIGNAL(propChanged())); } + int myUnconnectedSignalCount() { return receivers(SIGNAL(myUnconnectedSignal())); } signals: void mySignal(); void propChanged(); + void myUnconnectedSignal(); + +private: + friend class tst_qqmllanguage; }; class MyDotPropertyObject : public QObject diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index ed94eff574..6a4acb3280 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -2738,6 +2738,11 @@ void tst_qqmllanguage::receivers() QVERIFY(o != 0); QCOMPARE(o->mySignalCount(), 1); QCOMPARE(o->propChangedCount(), 2); + QCOMPARE(o->myUnconnectedSignalCount(), 0); + + QVERIFY(o->isSignalConnected(QMetaMethod::fromSignal(&MyReceiversTestObject::mySignal))); + QVERIFY(o->isSignalConnected(QMetaMethod::fromSignal(&MyReceiversTestObject::propChanged))); + QVERIFY(!o->isSignalConnected(QMetaMethod::fromSignal(&MyReceiversTestObject::myUnconnectedSignal))); delete o; } -- cgit v1.2.3