diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-04-06 12:18:42 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-04-19 07:03:31 +0000 |
| commit | f648d720d0c2a5dcef02c10cfe6cfaea717a6cdc (patch) | |
| tree | b2ba0cd1b6073b75b2159a05b4744dbb7779c133 /tools | |
| parent | 7c4111286b3c1f072a731ae9aa938c9e73b035e7 (diff) | |
Allow history states for <scxml>'s "initial" attribute
The standard doesn't seem to prohibit this and QStateMachine can
handle it.
Change-Id: Ia22f564c9657582199c3c67318fafd21ec4a8770
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qscxmlc/scxmlcppdumper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp index c656376..5f37ac8 100644 --- a/tools/qscxmlc/scxmlcppdumper.cpp +++ b/tools/qscxmlc/scxmlcppdumper.cpp @@ -526,11 +526,11 @@ protected: bool visit(DocumentModel::HistoryState *node) Q_DECL_OVERRIDE { // Includes: - clazz.implIncludes << "QHistoryState"; + clazz.implIncludes << "QScxmlHistoryState"; const QString stateName = mangledName(node, StateName); // Declaration: - clazz.classFields << QStringLiteral("QHistoryState ") + stateName + QLatin1Char(';'); + clazz.classFields << QStringLiteral("QScxmlHistoryState ") + stateName + QLatin1Char(';'); // Initializer: clazz.constructor.initializer << generateInitializer(node); @@ -550,7 +550,7 @@ protected: default: Q_UNREACHABLE(); } - clazz.init.impl << stateName + QStringLiteral(".setHistoryType(QHistoryState::") + depth + QStringLiteral("History);"); + clazz.init.impl << stateName + QStringLiteral(".setHistoryType(QScxmlHistoryState::") + depth + QStringLiteral("History);"); // visit the kid: if (Transition *t = node->defaultConfiguration()) { |