diff options
author | Martin Smith <martin.smith@digia.com> | 2013-10-23 13:55:53 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-01 14:52:47 +0100 |
commit | 0b152831ccee309f020435ab0737af6c73362dec (patch) | |
tree | 328ae16d222689315cc82a75622d80fac76c69a9 /src/tools/qdoc/qmlparser/qqmljsastvisitor_p.h | |
parent | e9fe369321939a6c1cb0ba822272875481dc038e (diff) |
qdoc: Update qdoc's QML parser
Because qdoc is part of qtbase/src/tools, it is not allowed to depend
on anything outside of qtbase. But qdoc uses the QML parser from
qtdeclarative, so qdoc has its own copy of the QML parser sources. The
QML parser has been updated to the current version for Qt 5.2.
Task-number: QTBUG-34269
Change-Id: I5ac9c8ff08a3494d5c35a0014a437be88f2dc31d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
Diffstat (limited to 'src/tools/qdoc/qmlparser/qqmljsastvisitor_p.h')
-rw-r--r-- | src/tools/qdoc/qmlparser/qqmljsastvisitor_p.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/tools/qdoc/qmlparser/qqmljsastvisitor_p.h b/src/tools/qdoc/qmlparser/qqmljsastvisitor_p.h index ef022f617c..1d67d4c75d 100644 --- a/src/tools/qdoc/qmlparser/qqmljsastvisitor_p.h +++ b/src/tools/qdoc/qmlparser/qqmljsastvisitor_p.h @@ -71,7 +71,8 @@ public: // Ui virtual bool visit(UiProgram *) { return true; } - virtual bool visit(UiImportList *) { return true; } + virtual bool visit(UiHeaderItemList *) { return true; } + virtual bool visit(UiPragma *) { return true; } virtual bool visit(UiImport *) { return true; } virtual bool visit(UiPublicMember *) { return true; } virtual bool visit(UiSourceElement *) { return true; } @@ -84,10 +85,12 @@ public: virtual bool visit(UiObjectMemberList *) { return true; } virtual bool visit(UiArrayMemberList *) { return true; } virtual bool visit(UiQualifiedId *) { return true; } + virtual bool visit(UiQualifiedPragmaId *) { return true; } virtual void endVisit(UiProgram *) {} - virtual void endVisit(UiImportList *) {} virtual void endVisit(UiImport *) {} + virtual void endVisit(UiHeaderItemList *) {} + virtual void endVisit(UiPragma *) {} virtual void endVisit(UiPublicMember *) {} virtual void endVisit(UiSourceElement *) {} virtual void endVisit(UiObjectDefinition *) {} @@ -99,6 +102,7 @@ public: virtual void endVisit(UiObjectMemberList *) {} virtual void endVisit(UiArrayMemberList *) {} virtual void endVisit(UiQualifiedId *) {} + virtual void endVisit(UiQualifiedPragmaId *) {} // QQmlJS virtual bool visit(ThisExpression *) { return true; } |