diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-06-15 11:47:56 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-27 05:08:52 +0200 |
| commit | 6afc3be37712416aa56940848aebe7682ad9e88f (patch) | |
| tree | 1744e0c5e6e55103921f9de44e86162b552461bd /tests | |
| parent | fbd2995c6165c05a0c1aea3b6e23cb4d6745d561 (diff) | |
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 <michael.brasser@nokia.com>
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/testtypes.h | 5 | ||||
| -rw-r--r-- | tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
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; } |