diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:28:57 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:28:57 (GMT) |
commit | b768917f043bd78ac8af125c1993f05776a052b7 (patch) | |
tree | 754a0eba403a781332f28da087c8493c82a57fd5 /tools | |
parent | be63c460b84c694dbae10494e491256bd53a5c0b (diff) | |
parent | fafec8f2363fd7ab3ce5b81a66cc82001a58c8ed (diff) | |
download | Qt-b768917f043bd78ac8af125c1993f05776a052b7.zip Qt-b768917f043bd78ac8af125c1993f05776a052b7.tar.gz Qt-b768917f043bd78ac8af125c1993f05776a052b7.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 5dfff27..5406017 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -3519,6 +3519,11 @@ void HtmlGenerator::findAllClasses(const InnerNode *node) */ void HtmlGenerator::findAllSince(const InnerNode *node, QString version) { + const QRegExp versionSeparator("[\\-\\.]"); + const int minorIndex = version.indexOf(versionSeparator); + const int patchIndex = version.indexOf(versionSeparator, minorIndex+1); + version = version.left(patchIndex); + NodeList::const_iterator c = node->childNodes().constBegin(); while (c != node->childNodes().constEnd()) { if (((*c)->access() != Node::Private) && ((*c)->since() == version)) { |