diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-11-30 17:44:23 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-11-30 17:44:23 (GMT) |
| commit | 39fde39430870467c41fbddd79b2b2d8788e45e2 (patch) | |
| tree | aa3a7e99604e0f4eb4b6e95ee28a9824fe8023bc /tools/qdoc3/htmlgenerator.h | |
| parent | 88a86d8e2c82edf53b56afcc2f80fffd32a18e49 (diff) | |
| parent | 1cbae5156277887bff3328304381d3436438a1ad (diff) | |
| download | Qt-39fde39430870467c41fbddd79b2b2d8788e45e2.zip Qt-39fde39430870467c41fbddd79b2b2d8788e45e2.tar.gz Qt-39fde39430870467c41fbddd79b2b2d8788e45e2.tar.bz2 | |
Merge branch '4.7' into qdoc-simplified
Conflicts:
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
Diffstat (limited to 'tools/qdoc3/htmlgenerator.h')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index 4276475..8b5c50b 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -217,7 +217,7 @@ class HtmlGenerator : public PageGenerator void generateStatus(const Node *node, CodeMarker *marker); QString registerRef(const QString& ref); - QString fileBase(const Node *node); + virtual QString fileBase(const Node *node) const; QString fileName(const Node *node); void findAllClasses(const InnerNode *node); void findAllFunctions(const InnerNode *node); |