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

Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec

3 files changed, 92 insertions, 5 deletions

diff --git a/src/imports/statemachine/plugin.cpp b/src/imports/statemachine/plugin.cpp
index 2242ccf5e3..db79751b69 100644
--- a/src/imports/statemachine/plugin.cpp
+++ b/src/imports/statemachine/plugin.cpp
@@ -72,7 +72,7 @@ public:
         qmlRegisterUncreatableType<QState>(uri, 1, 0, "QState", "Don't use this, use State instead");
         qmlRegisterUncreatableType<QAbstractState>(uri, 1, 0, "QAbstractState", "Don't use this, use State instead");
         qmlRegisterUncreatableType<QSignalTransition>(uri, 1, 0, "QSignalTransition", "Don't use this, use SignalTransition instead");
-        qmlRegisterType<SignalTransition>(uri, 1, 0, "SignalTransition");
+        qmlRegisterCustomType<SignalTransition>(uri, 1, 0, "SignalTransition", new SignalTransitionParser);
         qmlRegisterType<TimeoutTransition>(uri, 1, 0, "TimeoutTransition");
         qmlProtectModule(uri, 1);
     }
diff --git a/src/imports/statemachine/signaltransition.cpp b/src/imports/statemachine/signaltransition.cpp
index 7eee8af3bc..47efc9ec15 100644
--- a/src/imports/statemachine/signaltransition.cpp
+++ b/src/imports/statemachine/signaltransition.cpp
@@ -51,9 +51,10 @@
 #include <private/qjsvalue_p.h>
 #include <private/qv4scopedvalue_p.h>
 #include <private/qqmlcontext_p.h>
+#include <private/qqmlboundsignal_p.h>
 
 SignalTransition::SignalTransition(QState *parent)
-    : QSignalTransition(this, SIGNAL(invokeYourself()), parent)
+    : QSignalTransition(this, SIGNAL(invokeYourself()), parent), m_complete(false), m_signalExpression(Q_NULLPTR)
 {
     connect(this, SIGNAL(signalChanged()), SIGNAL(qmlSignalChanged()));
 }
@@ -86,6 +87,15 @@ bool SignalTransition::eventTest(QEvent *event)
     return result.toBool();
 }
 
+void SignalTransition::onTransition(QEvent *event)
+{
+    if (m_signalExpression) {
+        QStateMachine::SignalEvent *e = static_cast<QStateMachine::SignalEvent*>(event);
+        m_signalExpression->evaluate(e->arguments());
+    }
+    QSignalTransition::onTransition(event);
+}
+
 const QJSValue& SignalTransition::signal()
 {
     return m_signal;
@@ -110,6 +120,8 @@ void SignalTransition::setSignal(const QJSValue &signal)
 
     QSignalTransition::setSenderObject(sender);
     QSignalTransition::setSignal(metaMethod.methodSignature());
+
+    connectTriggered();
 }
 
 QQmlScriptString SignalTransition::guard() const
@@ -131,6 +143,60 @@ void SignalTransition::invoke()
     emit invokeYourself();
 }
 
+void SignalTransition::connectTriggered()
+{
+    if (!m_complete || !m_cdata)
+        return;
+
+    QObject *target = senderObject();
+    QQmlData *ddata = QQmlData::get(this);
+    QQmlContextData *ctxtdata = ddata ? ddata->outerContext : 0;
+
+    Q_ASSERT(m_bindings.count() == 1);
+    const QV4::CompiledData::Binding *binding = m_bindings.at(0);
+    Q_ASSERT(binding->type == QV4::CompiledData::Binding::Type_Script);
+
+    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);
+    QMetaMethod metaMethod = target->metaObject()->method(qobjectSignal->methodIndex());
+    int signalIndex = QMetaObjectPrivate::signalIndex(metaMethod);
+
+    QQmlBoundSignalExpression *expression = ctxtdata ?
+                new QQmlBoundSignalExpression(target, signalIndex,
+                                              ctxtdata, this, m_cdata->compilationUnit->runtimeFunctions[binding->value.compiledScriptIndex]) : 0;
+    if (expression)
+        expression->setNotifyOnValueChanged(false);
+    m_signalExpression = expression;
+}
+
+void SignalTransitionParser::verifyBindings(const QV4::CompiledData::Unit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &props)
+{
+    for (int ii = 0; ii < props.count(); ++ii) {
+        const QV4::CompiledData::Binding *binding = props.at(ii);
+
+        QString propName = qmlUnit->stringAt(binding->propertyNameIndex);
+
+        if (propName != QStringLiteral("onTriggered")) {
+            error(props.at(ii), SignalTransition::tr("Cannot assign to non-existent property \"%1\"").arg(propName));
+            return;
+        }
+
+        if (binding->type != QV4::CompiledData::Binding::Type_Script) {
+            error(binding, SignalTransition::tr("SignalTransition: script expected"));
+            return;
+        }
+    }
+}
+
+void SignalTransitionParser::applyBindings(QObject *object, QQmlCompiledData *cdata, const QList<const QV4::CompiledData::Binding *> &bindings)
+{
+    SignalTransition *st = qobject_cast<SignalTransition*>(object);
+    st->m_cdata = cdata;
+    st->m_bindings = bindings;
+}
+
 /*!
     \qmltype QAbstractTransition
     \inqmlmodule QtQml.StateMachine
diff --git a/src/imports/statemachine/signaltransition.h b/src/imports/statemachine/signaltransition.h
index e8e064a995..3471aea0c8 100644
--- a/src/imports/statemachine/signaltransition.h
+++ b/src/imports/statemachine/signaltransition.h
@@ -45,12 +45,17 @@
 #include <QtQml/QJSValue>
 
 #include <QtQml/qqmlscriptstring.h>
+#include <QtQml/qqmlparserstatus.h>
+#include <private/qqmlcustomparser_p.h>
+#include <private/qqmlboundsignalexpressionpointer_p.h>
+#include <private/qqmlcompiler_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class SignalTransition : public QSignalTransition
+class SignalTransition : public QSignalTransition, public QQmlParserStatus
 {
     Q_OBJECT
+    Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(QJSValue signal READ signal WRITE setSignal NOTIFY qmlSignalChanged)
     Q_PROPERTY(QQmlScriptString guard READ guard WRITE setGuard NOTIFY guardChanged)
 
@@ -60,7 +65,8 @@ public:
     QQmlScriptString guard() const;
     void setGuard(const QQmlScriptString &guard);
 
-    bool eventTest(QEvent *event);
+    bool eventTest(QEvent *event) Q_DECL_OVERRIDE;
+    void onTransition(QEvent *event) Q_DECL_OVERRIDE;
 
     const QJSValue &signal();
     void setSignal(const QJSValue &signal);
@@ -76,9 +82,24 @@ Q_SIGNALS:
     void qmlSignalChanged();
 
 private:
-    QByteArray m_data;
+    void classBegin() Q_DECL_OVERRIDE { m_complete = false; }
+    void componentComplete() Q_DECL_OVERRIDE { m_complete = true; connectTriggered(); }
+    void connectTriggered();
+
+    friend class SignalTransitionParser;
     QJSValue m_signal;
     QQmlScriptString m_guard;
+    bool m_complete;
+    QQmlRefPointer<QQmlCompiledData> m_cdata;
+    QList<const QV4::CompiledData::Binding *> m_bindings;
+    QQmlBoundSignalExpressionPointer m_signalExpression;
+};
+
+class SignalTransitionParser : public QQmlCustomParser
+{
+public:
+    void verifyBindings(const QV4::CompiledData::Unit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &props) Q_DECL_OVERRIDE;
+    void applyBindings(QObject *object, QQmlCompiledData *cdata, const QList<const QV4::CompiledData::Binding *> &bindings) Q_DECL_OVERRIDE;
 };
 
 QT_END_NAMESPACE