From 605777e6cf557dbaf2835c63562bf3fe1620ee45 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 18 Sep 2014 17:03:44 +0200 Subject: 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 Reviewed-by: Lars Knoll --- tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') 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() << "int" << "bool" << "double") << (QList() << "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() << QMetaType::QVariant << qMetaTypeId()) - << (QList() << "QVariant" << "QJSValue") + << (QList() << QMetaType::QVariant << QMetaType::QVariant) + << (QList() << "QVariant" << "QVariant") << (QList() << "foo" << "bar"); QTest::newRow("testSignal(color foo, date bar, url baz)") << "signal.5.qml" << "testSignal(QColor,QDateTime,QUrl)" -- cgit v1.2.3