diff options
author | Risto Avila <risto.avila@theqtcompany.com> | 2015-09-24 10:32:06 +0300 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-09-25 12:26:33 +0300 |
commit | ad762241e64024fed6dac9be4eb2224dfbb2ac6e (patch) | |
tree | cea47b9090c4446be3cae52c66f31febd37320d7 | |
parent | 8cb9b7ec8b51e5d751f7c61b57376ad32005db10 (diff) |
Compile fixes against 5.5
Change-Id: Iaa86fd7f27c082199d10633685a55d8b1d27171f
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
-rw-r--r-- | src/scxml/qscxmlparser.cpp | 4 | ||||
-rw-r--r-- | tools/qscxmlc/scxmlcppdumper.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/scxml/qscxmlparser.cpp b/src/scxml/qscxmlparser.cpp index a6e9200..8514966 100644 --- a/src/scxml/qscxmlparser.cpp +++ b/src/scxml/qscxmlparser.cpp @@ -699,12 +699,12 @@ private: if (QHistoryState *parent = qobject_cast<QHistoryState*>(m_parents.last())) { // QHistoryState cannot have an initial transition, only an initial state. // So, work around that by creating an initial state, and add the transition to that. - parentState = new ScxmlState(parent->parentState()); + parentState = new QScxmlState(parent->parentState()); parent->setDefaultState(parentState); } else { parentState = currentParent(); } - auto newTransition = new ScxmlTransition(parentState, toUtf8(node->events)); + auto newTransition = new QScxmlTransition(parentState, toUtf8(node->events)); parentState->addTransition(newTransition); #endif diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp index 6b4ae88..f6cd968 100644 --- a/tools/qscxmlc/scxmlcppdumper.cpp +++ b/tools/qscxmlc/scxmlcppdumper.cpp @@ -267,7 +267,7 @@ protected: switch (node->dataModel) { case Scxml::NullDataModel: clazz.classFields << QStringLiteral("QScxmlNullDataModel dataModel;"); - clazz.implIncludes << QStringLiteral("QScxmlNullDataModel.h"); + clazz.implIncludes << QStringLiteral("QScxmlNullDataModel"); break; case Scxml::JSDataModel: clazz.classFields << QStringLiteral("QScxmlEcmaScriptDataModel dataModel;"); |