From 2fc44e65e572b0481614ab4e6957ca75969355e8 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 25 Mar 2014 20:36:44 +0100 Subject: Doc: Remove nonexistent qtwebkitwidgets reference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no such qtwebkitwidgets.index file to be used in \depends Change-Id: I191801d22d908721e8d65b610f684c23b7dc7870 Reviewed-by: Topi Reiniö Reviewed-by: Jerome Pasion --- doc/qtwebkitexamples.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/qtwebkitexamples.qdocconf b/doc/qtwebkitexamples.qdocconf index b468664..690af1d 100644 --- a/doc/qtwebkitexamples.qdocconf +++ b/doc/qtwebkitexamples.qdocconf @@ -27,7 +27,7 @@ qhp.QtWebKitExamples.subprojects.manual.type = manual outputdir = $QT_INSTALL_DOCS/qtwebkitexamples -depends += qtcore qtwidgets qtquick qtgui qtscript qtdoc qtxml qtwebkitwidgets qtwebkit +depends += qtcore qtwidgets qtquick qtgui qtscript qtdoc qtxml qtwebkit exampledirs = ../examples -- cgit v1.2.3 From c9d13139b65818785f218cc96d136d33591ca2f5 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 26 Mar 2014 21:39:01 +0100 Subject: Doc: Fix most of the documentation warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - adding missing index files to \depends - fix warning: Can't link to 'The QtWebKit Bridge' Change-Id: I60665627f1aadbf7bd8a20ddda7d22db9ad694dc Reviewed-by: Jędrzej Nowacki Reviewed-by: Jerome Pasion --- doc/qtwebkitexamples.qdocconf | 2 +- .../imageanalyzer/doc/src/webkit-bridge-imageanalyzer.qdoc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/qtwebkitexamples.qdocconf b/doc/qtwebkitexamples.qdocconf index 690af1d..5fddf44 100644 --- a/doc/qtwebkitexamples.qdocconf +++ b/doc/qtwebkitexamples.qdocconf @@ -27,7 +27,7 @@ qhp.QtWebKitExamples.subprojects.manual.type = manual outputdir = $QT_INSTALL_DOCS/qtwebkitexamples -depends += qtcore qtwidgets qtquick qtgui qtscript qtdoc qtxml qtwebkit +depends += qtcore qtconcurrent qtdesigner qtqml qtnetwork qtwidgets qtquick qtgui qtscript qtdoc qtxml qtwebkit qtxmlpatterns exampledirs = ../examples diff --git a/examples/webkitwidgets/imageanalyzer/doc/src/webkit-bridge-imageanalyzer.qdoc b/examples/webkitwidgets/imageanalyzer/doc/src/webkit-bridge-imageanalyzer.qdoc index 35ca3bd..cbb2d4b 100644 --- a/examples/webkitwidgets/imageanalyzer/doc/src/webkit-bridge-imageanalyzer.qdoc +++ b/examples/webkitwidgets/imageanalyzer/doc/src/webkit-bridge-imageanalyzer.qdoc @@ -33,7 +33,7 @@ \ingroup webkit-widgetexamples In this example, we will show how to write a hybrid application using -\l{The QtWebKit Bridge}{QtWebKit Bridge}, which distinguishes itself from a +\l{The Qt WebKit Bridge}{Qt WebKit Bridge}, which distinguishes itself from a thin client in that it performs heavy calculations on the client side in C++, like a native application, but presents nothing more than a \c QWebView for its user interface, displaying web content written in HTML/JavaScript. The @@ -41,7 +41,7 @@ application uses QtConcurrent to distribute its work across as many CPU cores as are available from the system, so it can process each image in parallel. For the full reference documentation of QtWebKit hybrid development, see -\l{qtwebkit-bridge.html}{The QtWebKit Bridge}. +\l{qtwebkit-bridge.html}{The Qt WebKit Bridge}. Initially, you will see a user interface with an empty list of images. Clicking on some of the images in the lower pane below adds them to the list view above, -- cgit v1.2.3