diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-09-18 17:03:44 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-09-19 08:51:55 +0200 |
commit | 605777e6cf557dbaf2835c63562bf3fe1620ee45 (patch) | |
tree | ec767e304fc90b51c9a32d282faaa21395a71f05 /tests/auto/qml/qqmlmetaobject | |
parent | 5701b73e8215115fa47c373e0b846f28744dd4f1 (diff) |
Revert mapping of var signal parameters to QJSValue
This reverts commit 70004585f89f325f398c556d101bfa1833d87b53, which is
superseded by commit 3dbe05f6bf3fd51ce8097c35f6c7f12b39acb0f6, which is
a much better solution.
[ChangeLog][QtQml][Important Behavior Changes] Qt 5.3 changed the mapping
of "var" parameters in QML declared signals to QJSValue. This was reverted
to the behavior of earlier Qt versions to use QVariant. The original issue
of not being able to pass function objects through var parameters of QML
declared signals is solved by wrapping a QJSValue inside the QVariant.
Task-number: QTBUG-39971
Change-Id: I44de2ef2660c64c68e6a3b2a1ae251ad563d6b3c
Reviewed-by: Taylor Braun-Jones <taylor@braun-jones.org>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlmetaobject')
-rw-r--r-- | tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp b/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp index b6e7a43c46..ffaab792a7 100644 --- a/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp +++ b/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp @@ -327,11 +327,11 @@ void tst_QQmlMetaObject::method_data() << (QList<QByteArray>() << "int" << "bool" << "double") << (QList<QByteArray>() << "foo" << "bar" << "baz"); QTest::newRow("testSignal(variant foo, var bar)") << "signal.4.qml" - << "testSignal(QVariant,QJSValue)" + << "testSignal(QVariant,QVariant)" << QMetaMethod::Signal << int(QMetaType::Void) << "void" - << (QList<int>() << QMetaType::QVariant << qMetaTypeId<QJSValue>()) - << (QList<QByteArray>() << "QVariant" << "QJSValue") + << (QList<int>() << QMetaType::QVariant << QMetaType::QVariant) + << (QList<QByteArray>() << "QVariant" << "QVariant") << (QList<QByteArray>() << "foo" << "bar"); QTest::newRow("testSignal(color foo, date bar, url baz)") << "signal.5.qml" << "testSignal(QColor,QDateTime,QUrl)" |