diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-03-22 09:59:57 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-03-22 09:59:57 (GMT) |
| commit | e44cb1a030974f2954ca89265d98e84794b1c442 (patch) | |
| tree | 5c03786dc189e6b700266176972b9f57afd332b0 /tools | |
| parent | 1da3067db550d1be4d24caa39546458895b8d973 (diff) | |
| download | Qt-e44cb1a030974f2954ca89265d98e84794b1c442.zip Qt-e44cb1a030974f2954ca89265d98e84794b1c442.tar.gz Qt-e44cb1a030974f2954ca89265d98e84794b1c442.tar.bz2 | |
Adopting changes from a merge with qt-doc-team repo, 4.7 branch
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 2 | ||||
| -rw-r--r-- | tools/qdoc3/qdoc3.pro | 2 | ||||
| -rw-r--r-- | tools/qdoc3/qmlcodeparser.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 3e25cb7..2019e85 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -487,7 +487,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, case Atom::CaptionRight: endLink(); if (in_para) { - out() << "</p\n"; + out() << "</p>\n"; in_para = false; } break; diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro index 6f31c60..5b4131f 100644 --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro @@ -113,4 +113,4 @@ qch-docs.CONFIG += no_check_exist directory QMAKE_EXTRA_TARGETS += html-docs qch-docs target.path = $$[QT_INSTALL_BINS] -INSTALLS += target qch-docs +INSTALLS += target diff --git a/tools/qdoc3/qmlcodeparser.cpp b/tools/qdoc3/qmlcodeparser.cpp index 9c1d4ee..93a3ff9 100644 --- a/tools/qdoc3/qmlcodeparser.cpp +++ b/tools/qdoc3/qmlcodeparser.cpp @@ -142,7 +142,7 @@ void QmlCodeParser::doneParsingSourceFiles(Tree *tree) } /*! - Returns the set of strings reopresenting the topic commands. + Returns the set of strings representing the topic commands. */ QSet<QString> QmlCodeParser::topicCommands() { |