From 14985d7b4347ed422358f963ae184f4dcb22f66f Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Wed, 25 Jul 2012 09:48:42 +1000 Subject: [PATCH] Ensure params listed after unnamed params are available in QML. If a parameter in a bound signal had no name, it was excluded from the metaobject created by the bound signal expression. Change this so that unnamed parameters are still added (with an anonymous name). This means that subsequent parameters can be accessed from QML. Task-number: QTBUG-24481 Change-Id: Ia3403fb3bdc3da0c7e58baf7e891b67ed413bebd Reviewed-by: Matthew Vogt --- src/qml/qml/qqmlboundsignal.cpp | 8 +++++--- tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp index 3713de9..6c4465e 100644 --- a/src/qml/qml/qqmlboundsignal.cpp +++ b/src/qml/qml/qqmlboundsignal.cpp @@ -379,13 +379,15 @@ QQmlBoundSignalParameters::QQmlBoundSignalParameters(const QMetaMethod &method, types = new int[paramTypes.count()]; for (int ii = 0; ii < paramTypes.count(); ++ii) { const QByteArray &type = paramTypes.at(ii); - const QByteArray &name = paramNames.at(ii); - - if (name.isEmpty() || type.isEmpty()) { + if (type.isEmpty()) { types[ii] = 0; continue; } + QByteArray name = paramNames.at(ii); + if (name.isEmpty()) + name = "__qt_anonymous_param_" + QByteArray::number(ii); + int t = QMetaType::type(type.constData()); if (QQmlMetaType::isQObject(t)) { types[ii] = QMetaType::QObjectStar; diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index c7763fc..4e1638f 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -509,7 +509,6 @@ void tst_qqmlecmascript::signalAssignment() QVERIFY(object != 0); QCOMPARE(object->string(), QString()); emit object->unnamedArgumentSignal(19, 10.25, "Hello world!"); - QEXPECT_FAIL("", "QTBUG-24481", Continue); QCOMPARE(object->string(), QString("pass 19 Hello world!")); delete object; } -- 2.7.4