diff options
| author | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-10-18 12:29:21 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-10-18 10:48:54 +0000 |
| commit | d7398f7f482d7a318d75f183758ee9bb37980b1a (patch) | |
| tree | ddd2fcab454541a0d4c639243a14f2ce0705117c /tools/qscxmlc/scxmlcppdumper.cpp | |
| parent | f5929eaf624560217618c83a370dd52086e5a29a (diff) | |
Do not accidentally generate <::
C/C++ uses <: as a digraph (for an opening bracket), so
templateName<::namespaceName::className> would generate errors.
Task-number: QTBUG-53719
Change-Id: I32890db75e56470befeae0866307a6421ca3f911
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'tools/qscxmlc/scxmlcppdumper.cpp')
| -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 0afdad5..83a9886 100644 --- a/tools/qscxmlc/scxmlcppdumper.cpp +++ b/tools/qscxmlc/scxmlcppdumper.cpp @@ -154,7 +154,7 @@ QString createContainer(const QString &baseType, const QString &elementType, result += QStringLiteral("{ ") + elements.join(QStringLiteral(", ")) + QStringLiteral(" }"); } } else { - result += QStringLiteral("%1<%2>()").arg(baseType, elementType); + result += QStringLiteral("%1< %2 >()").arg(baseType, elementType); if (!elements.isEmpty()) { result += QStringLiteral(" << ") + elements.join(QStringLiteral(" << ")); } @@ -393,7 +393,7 @@ int createFactoryId(QStringList &factories, const QString &className, QString line = QStringLiteral("case %1: return new ").arg(QString::number(idx)); if (srcexpr == QScxmlExecutableContent::NoInstruction) { - line += QStringLiteral("QScxmlStaticScxmlServiceFactory<%1::%2>(%3, ") + line += QStringLiteral("QScxmlStaticScxmlServiceFactory< %1::%2 >(%3, ") .arg(namespacePrefix, className, QString::number(invokeLocation)); } else { line += QStringLiteral("QScxmlDynamicScxmlServiceFactory(%1, %2, ") |