diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-17 13:14:02 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-17 13:14:02 (GMT) |
| commit | d686053ffe0be98a11a8880d91cb738a65b8f338 (patch) | |
| tree | a31cf73236f40e639cfa7e4c97f9db1b001935c6 /tools/qdoc3 | |
| parent | 90c77df38c8168991ae69776a45aa4d08466f541 (diff) | |
| parent | da1b6e7199dfd63cce79af0bd875df78b4d199db (diff) | |
| download | Qt-d686053ffe0be98a11a8880d91cb738a65b8f338.zip Qt-d686053ffe0be98a11a8880d91cb738a65b8f338.tar.gz Qt-d686053ffe0be98a11a8880d91cb738a65b8f338.tar.bz2 | |
Merge branch '4.7' into qdoc-simplified
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/qmlmarkupvisitor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qdoc3/qmlmarkupvisitor.h b/tools/qdoc3/qmlmarkupvisitor.h index 60bc336..709a858 100644 --- a/tools/qdoc3/qmlmarkupvisitor.h +++ b/tools/qdoc3/qmlmarkupvisitor.h @@ -159,10 +159,11 @@ protected: QString protect(const QString &string); private: + typedef QHash<QString, QString> StringHash; void addExtra(quint32 start, quint32 finish); void addMarkedUpToken(QDeclarativeJS::AST::SourceLocation &location, const QString &text, - const QHash<QString, QString> &attributes = QHash<QString, QString>()); + const StringHash &attributes = StringHash()); void addVerbatim(QDeclarativeJS::AST::SourceLocation first, QDeclarativeJS::AST::SourceLocation last = QDeclarativeJS::AST::SourceLocation()); QString sourceText(QDeclarativeJS::AST::SourceLocation &location); |