Implement srcexpr in <invoke>

Change-Id: I572342eb4952a6a0777a7503d374da6536ba052d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 18 insertions, 2 deletions

diff --git a/src/scxml/qscxmlqstates.h b/src/scxml/qscxmlqstates.h
index 7280a0f..7014861 100644
--- a/src/scxml/qscxmlqstates.h
+++ b/src/scxml/qscxmlqstates.h
@@ -55,6 +55,7 @@ class QScxmlInvokeScxmlFactory: public QScxmlInvokableScxmlServiceFactory
 {
 public:
     QScxmlInvokeScxmlFactory(QScxmlExecutableContent::StringId invokeLocation,
+                             QScxmlExecutableContent::EvaluatorId srcexpr,
                              QScxmlExecutableContent::StringId id,
                              QScxmlExecutableContent::StringId idPrefix,
                              QScxmlExecutableContent::StringId idlocation,
@@ -62,12 +63,27 @@ public:
                              bool doAutoforward,
                              const QVector<Param> &params,
                              QScxmlExecutableContent::ContainerId finalize)
-        : QScxmlInvokableScxmlServiceFactory(invokeLocation, id, idPrefix, idlocation, namelist,
-                                             doAutoforward, params, finalize)
+        : QScxmlInvokableScxmlServiceFactory(invokeLocation,
+                                             srcexpr,
+                                             id,
+                                             idPrefix,
+                                             idlocation,
+                                             namelist,
+                                             doAutoforward,
+                                             params,
+                                             finalize)
     {}
 
     QScxmlInvokableService *invoke(QScxmlStateMachine *parent) Q_DECL_OVERRIDE
     {
+        bool ok = true;
+        auto srcexpr = calculateSrcexpr(parent, &ok);
+        if (!ok)
+            return Q_NULLPTR;
+
+        if (!srcexpr.isEmpty())
+            return loadAndInvokeDynamically(parent, srcexpr);
+
         return finishInvoke(new T, parent);
     }
 };