diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-06 00:11:52 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-06 00:11:52 +0100 |
| commit | b86106387350f673a20d3b0a2413023f6205169b (patch) | |
| tree | 2dfc079f1eecbbf9fde8733430a3a1e2f04d9a42 /src/tools/qdoc/qmlvisitor.h | |
| parent | 88918abddeb323340c4a49dda035898a740373da (diff) | |
| parent | 5e8ae03578ecd0538a774505f2f7e2fc626b0ab7 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/tools/qdoc/qmlvisitor.h')
| -rw-r--r-- | src/tools/qdoc/qmlvisitor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/qdoc/qmlvisitor.h b/src/tools/qdoc/qmlvisitor.h index 172aca579a..bfec61eb34 100644 --- a/src/tools/qdoc/qmlvisitor.h +++ b/src/tools/qdoc/qmlvisitor.h @@ -97,6 +97,7 @@ public: void endVisit(QQmlJS::AST::UiQualifiedId *); private: + QString getFullyQualifiedId(QQmlJS::AST::UiQualifiedId *id); QQmlJS::AST::SourceLocation precedingComment(quint32 offset) const; bool applyDocumentation(QQmlJS::AST::SourceLocation location, Node *node); void applyMetacommands(QQmlJS::AST::SourceLocation location, Node* node, Doc& doc); @@ -110,7 +111,7 @@ private: QString filePath; QString name; QString document; - QList<QPair<QString, QString> > importList; + ImportList importList; QSet<QString> commands; QSet<QString> topics; QSet<quint32> usedComments; |