Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp

Change-Id: I26d6435a29cac3840bb567ade5149c2562a94bf9

1 files changed, 21 insertions, 8 deletions

diff --git a/src/imports/statemachine/signaltransition.cpp b/src/imports/statemachine/signaltransition.cpp
index 127494d8d3..2e6381fc08 100644
--- a/src/imports/statemachine/signaltransition.cpp
+++ b/src/imports/statemachine/signaltransition.cpp
@@ -78,8 +78,9 @@ bool SignalTransition::eventTest(QEvent *event)
     // Set arguments as context properties
     int count = e->arguments().count();
     QMetaMethod metaMethod = e->sender()->metaObject()->method(e->signalIndex());
+    const auto parameterNames = metaMethod.parameterNames();
     for (int i = 0; i < count; i++)
-        context.setContextProperty(metaMethod.parameterNames()[i], QVariant::fromValue(e->arguments().at(i)));
+        context.setContextProperty(parameterNames[i], QVariant::fromValue(e->arguments().at(i)));
 
     QQmlExpression expr(m_guard, &context, this);
     QVariant result = expr.evaluate();
@@ -111,15 +112,27 @@ void SignalTransition::setSignal(const QJSValue &signal)
     QV4::ExecutionEngine *jsEngine = QV8Engine::getV4(QQmlEngine::contextForObject(this)->engine());
     QV4::Scope scope(jsEngine);
 
-    QV4::Scoped<QV4::QObjectMethod> qobjectSignal(scope, QJSValuePrivate::convertedToValue(jsEngine, m_signal));
-    Q_ASSERT(qobjectSignal);
-
-    QObject *sender = qobjectSignal->object();
-    Q_ASSERT(sender);
-    QMetaMethod metaMethod = sender->metaObject()->method(qobjectSignal->methodIndex());
+    QObject *sender;
+    QMetaMethod signalMethod;
+
+    QV4::ScopedValue value(scope, QJSValuePrivate::convertedToValue(jsEngine, m_signal));
+
+    // Did we get the "slot" that can be used to invoke the signal?
+    if (QV4::QObjectMethod *signalSlot = value->as<QV4::QObjectMethod>()) {
+        sender = signalSlot->object();
+        Q_ASSERT(sender);
+        signalMethod = sender->metaObject()->method(signalSlot->methodIndex());
+    } else if (QV4::QmlSignalHandler *signalObject = value->as<QV4::QmlSignalHandler>()) { // or did we get the signal object (the one with the connect()/disconnect() functions) ?
+        sender = signalObject->object();
+        Q_ASSERT(sender);
+        signalMethod = sender->metaObject()->method(signalObject->signalIndex());
+    } else {
+        qmlInfo(this) << tr("Specified signal does not exist.");
+        return;
+    }
 
     QSignalTransition::setSenderObject(sender);
-    QSignalTransition::setSignal(metaMethod.methodSignature());
+    QSignalTransition::setSignal(signalMethod.methodSignature());
 
     connectTriggered();
 }