From 9b3f233c6740d4a703c53bd6bbb373115c5bf520 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Thu, 3 Mar 2011 17:17:58 +0100
Subject: Fixed invalid HTML output.

---
 tools/qdoc3/htmlgenerator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
cgit v0.12


From 7e9c0cbf02be5f7c426a81e53b5b0df39b5328ce Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Thu, 3 Mar 2011 18:04:55 +0100
Subject: Doc: Fixed QML snippet highlighting by creating a complete code
 snippet.

---
 doc/src/declarative/qmlwebkit.qdoc               | 5 +----
 doc/src/snippets/declarative/webview/webview.qml | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/src/declarative/qmlwebkit.qdoc b/doc/src/declarative/qmlwebkit.qdoc
index 354e60a..840f24d 100644
--- a/doc/src/declarative/qmlwebkit.qdoc
+++ b/doc/src/declarative/qmlwebkit.qdoc
@@ -42,14 +42,11 @@ The QtWebKit Module has a QML element, \l{WebView} for displaying web content
 from a \c URL.
 
 Import the QtWebKit module before declaring a \c WebView element:
-\qml
-import QtWebKit 1.0
-\endqml
+\snippet doc/src/snippets/declarative/webview/webview.qml import
 
 \section1 Simple Usage
 \snippet doc/src/snippets/declarative/webview/webview.qml document
 \image webview.png
 
 \sa {Models and Views: WebView Example}{WebView Example}, {QML Web Browser}
-
 */
diff --git a/doc/src/snippets/declarative/webview/webview.qml b/doc/src/snippets/declarative/webview/webview.qml
index c1cef33..a986fab 100644
--- a/doc/src/snippets/declarative/webview/webview.qml
+++ b/doc/src/snippets/declarative/webview/webview.qml
@@ -39,7 +39,9 @@
 ****************************************************************************/
 
 //! [document]
+//! [import]
 import QtWebKit 1.0
+//! [import]
 
 WebView {
     url: "http://www.nokia.com"
-- 
cgit v0.12


From 8b5eae8f21410435248240bcb9bc3ae203e2d587 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Tue, 15 Mar 2011 15:55:08 +0100
Subject: Doc: Fixed typo.

---
 tools/qdoc3/qmlcodeparser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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()
 {
-- 
cgit v0.12


From 3a2beec9378689c2ad32743cdf7965a49fc016df Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Fri, 18 Mar 2011 16:41:34 +0100
Subject: Removed the documentation from the install rule.

---
 tools/qdoc3/qdoc3.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v0.12


From 624368f588e555f523fc507986bf3ec80681be48 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Mon, 21 Mar 2011 19:16:36 +0100
Subject: qdoc: Avoid infinite loops in table of contents generation.

---
 tools/qdoc3/helpprojectwriter.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/qdoc3/helpprojectwriter.cpp b/tools/qdoc3/helpprojectwriter.cpp
index 949507f..1c7fcbf 100644
--- a/tools/qdoc3/helpprojectwriter.cpp
+++ b/tools/qdoc3/helpprojectwriter.cpp
@@ -702,6 +702,8 @@ void HelpProjectWriter::generateProject(HelpProject &project)
                 }
             } else {
                 // Find a contents node and navigate from there, using the NextLink values.
+                QSet<QString> visited;
+
                 foreach (const Node *node, subproject.nodes) {
                     QString nextTitle = node->links().value(Node::NextLink).first;
                     if (!nextTitle.isEmpty() &&
@@ -715,9 +717,10 @@ void HelpProjectWriter::generateProject(HelpProject &project)
                         while (nextPage) {
                             writeNode(project, writer, nextPage);
                             nextTitle = nextPage->links().value(Node::NextLink).first;
-                            if(nextTitle.isEmpty())
+                            if (nextTitle.isEmpty() || visited.contains(nextTitle))
                                 break;
                             nextPage = const_cast<FakeNode *>(tree->findFakeNodeByTitle(nextTitle));
+                            visited.insert(nextTitle);
                         }
                         break;
                     }
-- 
cgit v0.12