diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2016-11-24 16:17:20 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-12-19 09:23:27 +0000 |
commit | 51db93cf783662a155ced91dceef7508ffa955a6 (patch) | |
tree | 52fc72bb59cad1a04d9f19bb6892b0d0082c84c3 /tools | |
parent | 10bcb2ee73b557a9dfd72143f7bf0b42c607ecaf (diff) |
Resolve the mixup of various ID types
We should not compare instances of different IDs with one another.
Change-Id: I830d747ffde4c162c73475a600cef23e10c898e5
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qscxmlc/scxmlcppdumper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp index b539e0d..81b9dcf 100644 --- a/tools/qscxmlc/scxmlcppdumper.cpp +++ b/tools/qscxmlc/scxmlcppdumper.cpp @@ -374,7 +374,7 @@ int createFactoryId(QStringList &factories, const QString &className, const int idx = factories.size(); QString line = QStringLiteral("case %1: return new ").arg(QString::number(idx)); - if (invokeInfo.expr == QScxmlExecutableContent::NoInstruction) { + if (invokeInfo.expr == QScxmlExecutableContent::NoEvaluator) { line += QStringLiteral("QScxmlStaticScxmlServiceFactory< %1::%2 >(") .arg(namespacePrefix, className); } else { @@ -445,7 +445,7 @@ void CppDumper::dump(TranslationUnit *unit) const QVector<QScxmlExecutableContent::ParameterInfo> ¶meters, const QSharedPointer<DocumentModel::ScxmlDocument> &content) -> int { QString className; - if (invokeInfo.expr == QScxmlExecutableContent::NoInstruction) { + if (invokeInfo.expr == QScxmlExecutableContent::NoEvaluator) { className = mangleIdentifier(classnameForDocument.value(content.data())); } return createFactoryId(factories[i], className, namespacePrefix, |