diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-11-24 18:31:06 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-11-24 18:31:06 (GMT) |
| commit | f79dfe06afe9aae34e064b5668cc3429f659dd16 (patch) | |
| tree | fb7ef832f00e13357b11b8fce177f0146d9f3bb1 | |
| parent | 9830ef3b28502285a9c99ce07985668ad16a636a (diff) | |
| download | Qt-f79dfe06afe9aae34e064b5668cc3429f659dd16.zip Qt-f79dfe06afe9aae34e064b5668cc3429f659dd16.tar.gz Qt-f79dfe06afe9aae34e064b5668cc3429f659dd16.tar.bz2 | |
Added the version number to the configuration and fixed the generator.
Now the version number should appear in the documentation again.
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 4 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-project.qdocconf | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 74db762..b095f23 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1618,12 +1618,10 @@ void HtmlGenerator::generateHeader(const QString& title, out() << QString("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"%1\" lang=\"%1\">\n").arg(naturalLanguage); out() << "<head>\n"; out() << " <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n"; - QString shortVersion; - shortVersion = project + " " + shortVersion + ": "; if (node && !node->doc().location().isEmpty()) out() << "<!-- " << node->doc().location().fileName() << " -->\n"; - shortVersion = myTree->version(); + QString shortVersion = myTree->version(); if (shortVersion.count(QChar('.')) == 2) shortVersion.truncate(shortVersion.lastIndexOf(QChar('.'))); if (!shortVersion.isEmpty()) { diff --git a/tools/qdoc3/test/qt-project.qdocconf b/tools/qdoc3/test/qt-project.qdocconf index be2a227..135fbbb 100644 --- a/tools/qdoc3/test/qt-project.qdocconf +++ b/tools/qdoc3/test/qt-project.qdocconf @@ -6,6 +6,7 @@ include(qt-defines.qdocconf) project = Qt description = Qt Reference Documentation url = http://qt.nokia.com/doc/4.7 +version = 4.7.1 sourceencoding = UTF-8 outputencoding = UTF-8 @@ -86,7 +87,9 @@ excludedirs = $QT_SOURCE_TREE/src/3rdparty/clucene \ $QT_SOURCE_TREE/doc/src/ja_JP \ $QT_SOURCE_TREE/doc/src/zh_CN -sources.fileextensions = "*.cpp *.qdoc *.mm" +sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc" +headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx" + examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml" examples.imageextensions = "*.png" |