diff options
| author | Antti Piira <apiira@blackberry.com> | 2013-09-24 12:49:10 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-21 21:43:32 +0200 |
| commit | 9de3630a513aa598855f7d40461c5aec9ecce319 (patch) | |
| tree | 69eb5b78efbfe6cba7b7266a9adbe0e2bce77336 /src/qml/qml/qqmlscript.cpp | |
| parent | de31a57672ec461c2081f65e3631134ee45de887 (diff) | |
Add support CompositeSingleton to the new V4 compiler.v5.2.0-beta1
Implements QQmlCodeGenerator::visit(AST::UiPragma *) to process any
pragma statements in a QML file for the new V4 compiler approach.
Only pragma Singleton is supported, others will generate errors.
Also adds necessary hooks to treat types as Singletons. Basic
functionality is working, but three of the QML Singleton unit tests
fail. Some of them are dependent on other language capabilities that
seem to have problems.
In addition removes unnecessary toString() call in the equivalent
visit(AST::UiPragma *) function of the old parser.
Change-Id: Iec9fa887f953b80b7f9a11878d846637a8f519ef
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlscript.cpp')
| -rw-r--r-- | src/qml/qml/qqmlscript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlscript.cpp b/src/qml/qml/qqmlscript.cpp index cc01307e54..9fd06aa934 100644 --- a/src/qml/qml/qqmlscript.cpp +++ b/src/qml/qml/qqmlscript.cpp @@ -895,7 +895,7 @@ bool ProcessAST::visit(AST::UiPragma *node) // For now the only valid pragma is Singleton, so lets validate the input if (!node->pragmaType->name.isNull()) { - if (QLatin1String("Singleton") == node->pragmaType->name.toString()) + if (QLatin1String("Singleton") == node->pragmaType->name) { pragma.type = QQmlScript::Pragma::Singleton; } else { |