diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-19 10:06:55 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-19 10:10:24 (GMT) |
commit | 83525ca84ba7adadaeeb65ffa55a6d0f2630caaa (patch) | |
tree | 83a26fc42ba3811baf38776d266d4bf600684715 /tools/qdoc3/htmlgenerator.h | |
parent | b115770cc3bba68740a6848c7ccaed932399aca9 (diff) | |
parent | 4082e4711a1c54947429b15504caf778c6da22d0 (diff) | |
download | Qt-83525ca84ba7adadaeeb65ffa55a6d0f2630caaa.zip Qt-83525ca84ba7adadaeeb65ffa55a6d0f2630caaa.tar.gz Qt-83525ca84ba7adadaeeb65ffa55a6d0f2630caaa.tar.bz2 |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
src/gui/kernel/qgesturemanager.cpp
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Changes in qmake/generators/win32/msvc_objectmodel.cpp come
from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
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 d885ada..b96d737 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -241,7 +241,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; #if 0 QString fileBase(const Node *node, const SectionIterator& section); #endif |