diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 08:08:32 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 08:08:32 +0100 |
commit | 7a3dd4c1aef155bae57f0b79eacb3d85e1158c1e (patch) | |
tree | 5be261a82b44987cc026779ee7315875ee31f21a /tests/auto/qml/qjsengine/tst_qjsengine.cpp | |
parent | 0fab5761d5428aa708edd66e40fc3c449adc4b11 (diff) | |
parent | 19dffeed2e677cf03b6e122c7a15f355ebe413c8 (diff) |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: Ib4eb5c3572cb5ec11eb744572ec796dc7e70456d
Diffstat (limited to 'tests/auto/qml/qjsengine/tst_qjsengine.cpp')
-rw-r--r-- | tests/auto/qml/qjsengine/tst_qjsengine.cpp | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index 39bc8b2e5f..35824c6d00 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -190,6 +190,8 @@ private slots: void argumentEvaluationOrder(); + void v4FunctionWithoutQML(); + signals: void testSignal(); }; @@ -3799,6 +3801,30 @@ void tst_QJSEngine::argumentEvaluationOrder() } +class TestObject : public QObject +{ + Q_OBJECT +public: + TestObject() : called(false) {} + + bool called; + + Q_INVOKABLE void callMe(QQmlV4Function *) { + called = true; + } +}; + +void tst_QJSEngine::v4FunctionWithoutQML() +{ + TestObject obj; + QJSEngine engine; + QJSValue wrapper = engine.newQObject(&obj); + QQmlEngine::setObjectOwnership(&obj, QQmlEngine::CppOwnership); + QVERIFY(!obj.called); + wrapper.property("callMe").call(); + QVERIFY(obj.called); +} + QTEST_MAIN(tst_QJSEngine) #include "tst_qjsengine.moc" |