From f03585b7583bd2e7328d462a63ee6ee8938b200c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCri=20Valdmann?= Date: Tue, 6 Jun 2017 11:27:17 +0200 Subject: Fix some minor issues in example docs Task-number: QTBUG-60655 Change-Id: Ie385232d5c126eafc18c08f49c15cc5e18c69ba1 Reviewed-by: Leena Miettinen Reviewed-by: Michal Klocek --- examples/webengine/customdialogs/doc/src/customdialogs.qdoc | 9 +++++---- .../webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc | 2 +- .../contentmanipulation/doc/src/contentmanipulation.qdoc | 6 +++--- .../webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) (limited to 'examples') diff --git a/examples/webengine/customdialogs/doc/src/customdialogs.qdoc b/examples/webengine/customdialogs/doc/src/customdialogs.qdoc index f5a18b591..2162fe4ca 100644 --- a/examples/webengine/customdialogs/doc/src/customdialogs.qdoc +++ b/examples/webengine/customdialogs/doc/src/customdialogs.qdoc @@ -58,10 +58,11 @@ \section1 Triggering Dialogs - The technical details on how the dialogs are triggered are beyond the scope - of this example. The only thing worth mentioning is that we fire up the - localhost TCP server when the example starts up. The server is needed to - get proxy and HTTP authentication requests. + As mentioned, the \l {webengine/customdialogs/index.html}{index.html} file + is responsible for triggering the dialogs from the side of HTML and + JavaScript. Additionally, the example program starts a localhost TCP server + returning the mocked HTTP responses needed to trigger proxy and HTTP + authentication dialogs. \section1 Custom Dialogs diff --git a/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc b/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc index 75c2997e8..93b3ed51a 100644 --- a/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc +++ b/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc @@ -43,7 +43,7 @@ screen mode by using a toolbar button. They can leave fullscreen mode by using a keyboard shortcut. Additional toolbar buttons enable moving backwards and forwards in the browser history, reloading tab content, and opening a settings menu for enabling the following features: - JavaScript, plugins, fullscreen mode, off the record, HTTP disc cache, autoloading images, and + JavaScript, plugins, fullscreen mode, off the record, HTTP disk cache, autoloading images, and ignoring certificate errors. \include examples-run.qdocinc diff --git a/examples/webenginewidgets/contentmanipulation/doc/src/contentmanipulation.qdoc b/examples/webenginewidgets/contentmanipulation/doc/src/contentmanipulation.qdoc index aa94b17da..685c20abc 100644 --- a/examples/webenginewidgets/contentmanipulation/doc/src/contentmanipulation.qdoc +++ b/examples/webenginewidgets/contentmanipulation/doc/src/contentmanipulation.qdoc @@ -36,7 +36,7 @@ \e{Content Manipulation} shows how to use JQuery with \l {Qt WebEngine Widgets} to create a web browser with special effects and content manipulation. - In the application, we call QWebEnginePage::runJavaScript() to + In the application, we call \l {QWebEnginePage::runJavaScript()} to execute jQuery JavaScript code. We implement a QMainWindow with a QWebEngineView as a central widget to build up the browser itself. @@ -51,7 +51,7 @@ \skipto class MainWindow : \printuntil /^\}/ - We also declare a QString that contains the jQuery, a QWebEngineView + We also declare a QString that contains jQuery, a QWebEngineView that displays the web content, and a QLineEdit that acts as the address bar. @@ -76,7 +76,7 @@ \printuntil SLOT(finishLoading - Furthermore, we create a QLineEdit as the browser's address bar. We then set the horizontal + Furthermore, we create a QLineEdit as the browser's address bar. We then set the vertical QSizePolicy to fill the available area in the browser at all times. We add the QLineEdit to a QToolBar together with a set of navigation actions from QWebEngineView::pageAction(): diff --git a/examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc b/examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc index 0239c1065..a20dc04c5 100644 --- a/examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc +++ b/examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc @@ -139,7 +139,7 @@ \printto defaultTextFile - The menu items are connected to the mapping member slots. The + The menu items are connected to the corresponding member slots. The \uicontrol Save item is activated or deactivated depending on whether the user has edited the content. -- cgit v1.2.3