diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:47:50 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:47:50 +0300 |
| commit | c8e7417c3a8366ac423efef73b6d97cea70ada61 (patch) | |
| tree | 380e928adf9e4391c09ce18451edf18d7c4394b4 | |
| parent | ca86a7f6a1fe7a3de527c89ea47552a0e15d2457 (diff) | |
| parent | c9d13139b65818785f218cc96d136d33591ca2f5 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I7536b96428331f5da97ccd8108316e1fd1fecf9b
| -rw-r--r-- | doc/qtwebkitexamples.qdocconf | 2 | ||||
| -rw-r--r-- | examples/webkitwidgets/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 b468664..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 qtwebkitwidgets 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, |