diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:21:11 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:21:11 +0100 |
| commit | 5d851f27a3c72e46df0dfdd234fc3a300a2870fb (patch) | |
| tree | 4fa416bfe19dd0de544a1babc649ecd66d814346 /src/scxml/qscxmltabledata_p.h | |
| parent | 4b4e81398bdfcda23a9e3c86a297e12b2ff1e9d9 (diff) | |
| parent | c575eb524bc26fc4af3711d634110c226c9e11c0 (diff) | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I639eb3acef7004a20447bbb66fb44661bf8e952e
Diffstat (limited to 'src/scxml/qscxmltabledata_p.h')
| -rw-r--r-- | src/scxml/qscxmltabledata_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scxml/qscxmltabledata_p.h b/src/scxml/qscxmltabledata_p.h index 2c825db..767b88a 100644 --- a/src/scxml/qscxmltabledata_p.h +++ b/src/scxml/qscxmltabledata_p.h @@ -117,7 +117,7 @@ public: QVector<QScxmlExecutableContent::AssignmentInfo> theAssignments; QVector<QScxmlExecutableContent::ForeachInfo> theForeaches; QVector<QScxmlExecutableContent::StringId> theDataNameIds; - QScxmlExecutableContent::EvaluatorId theInitialSetup; + QScxmlExecutableContent::ContainerId theInitialSetup; int theName; }; } // QScxmlInternal namespace |