diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-02-03 12:38:35 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-02-03 12:38:35 (GMT) |
| commit | 22ea0648e446136cc2a301ec3a38019ed6a3bd6e (patch) | |
| tree | 22466b217156cdca9207ac215ac6a34681af659e /tools | |
| parent | 1e7ab0e849900bacf71935f2a2150116b8dc17d1 (diff) | |
| parent | 2bbd2780b9028f9d765384868796424582b2fe6a (diff) | |
| download | Qt-22ea0648e446136cc2a301ec3a38019ed6a3bd6e.zip Qt-22ea0648e446136cc2a301ec3a38019ed6a3bd6e.tar.gz Qt-22ea0648e446136cc2a301ec3a38019ed6a3bd6e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/cppcodemarker.cpp | 2 | ||||
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.cpp | 2 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates-online.qdocconf | 2 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp index 9ad4d90..1b1e8f2 100644 --- a/tools/qdoc3/cppcodemarker.cpp +++ b/tools/qdoc3/cppcodemarker.cpp @@ -1085,7 +1085,7 @@ QString CppCodeMarker::addMarkUp(const QString &in, } QString text; - if (tag.isEmpty() && i == code.length()) + if ((tag.isEmpty() || second == 1) && i == code.length()) text = code.mid(second - 1, i - second + 1); else text = code.mid(second - 1, i - second); diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index 44df302..e180c0a 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -2285,7 +2285,7 @@ void DitaXmlGenerator::generateIncludes(const InnerNode* inner, CodeMarker* mark /*! zzz - Generates a table of contents begining at \a node. + Generates a table of contents beginning at \a node. Currently just returns without writing anything. */ void DitaXmlGenerator::generateTableOfContents(const Node* node, diff --git a/tools/qdoc3/test/qt-html-templates-online.qdocconf b/tools/qdoc3/test/qt-html-templates-online.qdocconf index bc7dbd2..dc84e7d 100644 --- a/tools/qdoc3/test/qt-html-templates-online.qdocconf +++ b/tools/qdoc3/test/qt-html-templates-online.qdocconf @@ -155,7 +155,7 @@ HTML.footer = \ " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2008-2010 Nokia Corporation and/or its\n" \ + " <acronym title=\"Copyright\">©</acronym> 2008-2011 Nokia Corporation and/or its\n" \ " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ " in Finland and/or other countries worldwide.</p>\n" \ " <p>\n" \ diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index e2d2b4a..6f756da 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -23,7 +23,7 @@ HTML.footer = \ "</div> \n" \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2008-2010 Nokia Corporation and/or its\n" \ + " <acronym title=\"Copyright\">©</acronym> 2008-2011 Nokia Corporation and/or its\n" \ " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ " in Finland and/or other countries worldwide.</p>\n" \ " <p>\n" \ |