diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-22 08:50:50 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-22 08:50:50 (GMT) |
commit | 8d5a395e176239b7e3ee8822cb251b2e631c21de (patch) | |
tree | 60dee6cd158820944b892183c0d77a1af47fab97 /tests | |
parent | 65e7073bb151bd9281b2d0be53f0c13cce90f3c0 (diff) | |
download | Qt-8d5a395e176239b7e3ee8822cb251b2e631c21de.zip Qt-8d5a395e176239b7e3ee8822cb251b2e631c21de.tar.gz Qt-8d5a395e176239b7e3ee8822cb251b2e631c21de.tar.bz2 |
Slight simplification of parameterized signals
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/declarative/qmlparser/assignSignal.qml | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qmlparser/testtypes.h | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qmlparser/tst_qmlparser.cpp | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlparser/assignSignal.qml b/tests/auto/declarative/qmlparser/assignSignal.qml index 153b403..3abc04d 100644 --- a/tests/auto/declarative/qmlparser/assignSignal.qml +++ b/tests/auto/declarative/qmlparser/assignSignal.qml @@ -1,4 +1,5 @@ import Test 1.0 MyQmlObject { onBasicSignal: basicSlot() + onBasicParameterizedSignal: basicSlot(parameter) } diff --git a/tests/auto/declarative/qmlparser/testtypes.h b/tests/auto/declarative/qmlparser/testtypes.h index e3e9aae..f6f966f 100644 --- a/tests/auto/declarative/qmlparser/testtypes.h +++ b/tests/auto/declarative/qmlparser/testtypes.h @@ -97,9 +97,11 @@ public: void setCustomType(const MyCustomVariantType &v) { m_custom = v; } public slots: void basicSlot() { qWarning("MyQmlObject::basicSlot"); } + void basicSlot(int v) { qWarning("MyQmlObject::basicSlot(%d)", v); } signals: void basicSignal(); + void basicParameterizedSignal(int parameter); private: friend class tst_qmlparser; diff --git a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp index ee1b072..c2f1e1a 100644 --- a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp +++ b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp @@ -376,6 +376,8 @@ void tst_qmlparser::assignSignal() QVERIFY(object != 0); QTest::ignoreMessage(QtWarningMsg, "MyQmlObject::basicSlot"); emit object->basicSignal(); + QTest::ignoreMessage(QtWarningMsg, "MyQmlObject::basicSlot(9)"); + emit object->basicParameterizedSignal(9); } // Tests the creation and assignment of dynamic properties |