diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-04-14 04:47:16 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2011-04-14 04:47:16 (GMT) |
| commit | cc3bcc003048760a501debe49b6fcebffaac3cef (patch) | |
| tree | 5d8d8e5ea0cd1c9dffc6abd3e6e40058536236c8 /tools/qdoc3/doc.h | |
| parent | a5d5971586d0a12e55374dae30e17454bca12600 (diff) | |
| parent | 662174b78b7e08c759d0086e215e81e9e0eaf0c5 (diff) | |
| download | Qt-cc3bcc003048760a501debe49b6fcebffaac3cef.zip Qt-cc3bcc003048760a501debe49b6fcebffaac3cef.tar.gz Qt-cc3bcc003048760a501debe49b6fcebffaac3cef.tar.bz2 | |
Merge branch 'master' of ../qt-qml-staging
Diffstat (limited to 'tools/qdoc3/doc.h')
| -rw-r--r-- | tools/qdoc3/doc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/qdoc3/doc.h b/tools/qdoc3/doc.h index ea832b1..e043b3a 100644 --- a/tools/qdoc3/doc.h +++ b/tools/qdoc3/doc.h @@ -64,7 +64,6 @@ class FakeNode; typedef QMap<QString, QStringList> QCommandMap; typedef QMap<QString, QString> QStringMap; -typedef QStringMap::const_iterator QStringMapEntry; typedef QMultiMap<QString, QString> QStringMultiMap; class Doc @@ -118,7 +117,7 @@ class Doc const QList<int> &tableOfContentsLevels() const; const QList<Atom *> &keywords() const; const QList<Atom *> &targets() const; - const QStringMap &metaTagMap() const; + const QStringMultiMap &metaTagMap() const; static void initialize( const Config &config ); static void terminate(); |