diff options
| -rw-r--r-- | doc/src/declarative/qmlwebkit.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/snippets/declarative/webview/webview.qml | 2 | ||||
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 2 | ||||
| -rw-r--r-- | tools/qdoc3/qdoc3.pro | 2 | ||||
| -rw-r--r-- | tools/qdoc3/qmlcodeparser.cpp | 2 |
5 files changed, 6 insertions, 7 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" 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() { |