diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-26 15:28:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-26 15:30:24 +0200 |
| commit | 6cdd1dc5b48dfe54de4d926fc9a64c46f3fc75f2 (patch) | |
| tree | d4b626a6041cac6e17bbd825d139b201e708f43d /examples/webenginewidgets | |
| parent | 7757ec1a562ae36b65a6cae93b3cd308247755ef (diff) | |
| parent | 6e019f2ad5a5d6341d14762fba5a245da46ebeb3 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
configure.json
src/3rdparty
tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
Change-Id: Id79ff6cf01c2db3a2044881ddcbf044abdf84936
Diffstat (limited to 'examples/webenginewidgets')
7 files changed, 7 insertions, 7 deletions
diff --git a/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc b/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc index 207f6285e..55ccd33d5 100644 --- a/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc +++ b/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc @@ -29,7 +29,7 @@ \example webenginewidgets/cookiebrowser \title WebEngine Cookie Browser Example \ingroup webengine-widgetexamples - \brief A cookie browser based on Qt WebEngine Widgets + \brief A cookie browser based on Qt WebEngine Widgets. \image cookiebrowser.png diff --git a/examples/webenginewidgets/html2pdf/doc/src/html2pdf.qdoc b/examples/webenginewidgets/html2pdf/doc/src/html2pdf.qdoc index 6203c6b2f..eea7f7c09 100644 --- a/examples/webenginewidgets/html2pdf/doc/src/html2pdf.qdoc +++ b/examples/webenginewidgets/html2pdf/doc/src/html2pdf.qdoc @@ -29,7 +29,7 @@ \example webenginewidgets/html2pdf \title WebEngine Widgets Html2Pdf Example \ingroup webengine-widgetexamples - \brief Converts web pages to PDF documents using Qt WebEngine + \brief Converts web pages to PDF documents using Qt WebEngine. \image html2pdf-example.png diff --git a/examples/webenginewidgets/maps/doc/src/maps.qdoc b/examples/webenginewidgets/maps/doc/src/maps.qdoc index 5eed9e713..5e4a5cd83 100644 --- a/examples/webenginewidgets/maps/doc/src/maps.qdoc +++ b/examples/webenginewidgets/maps/doc/src/maps.qdoc @@ -29,7 +29,7 @@ \example webenginewidgets/maps \title WebEngine Widgets Maps Example \ingroup webengine-widgetexamples - \brief Demonstrates how to handle geolocation requests + \brief Demonstrates how to handle geolocation requests. \image maps-example.png diff --git a/examples/webenginewidgets/minimal/doc/src/minimal.qdoc b/examples/webenginewidgets/minimal/doc/src/minimal.qdoc index b6eb10946..05ec9ee79 100644 --- a/examples/webenginewidgets/minimal/doc/src/minimal.qdoc +++ b/examples/webenginewidgets/minimal/doc/src/minimal.qdoc @@ -29,7 +29,7 @@ \example webenginewidgets/minimal \title WebEngine Widgets Minimal Example \ingroup webengine-widgetexamples - \brief Displays a web page using Qt WebEngine Widgets + \brief Displays a web page using Qt WebEngine Widgets. \image minimal-example.png diff --git a/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc b/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc index 655cded0a..2231d9667 100644 --- a/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc +++ b/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc @@ -29,7 +29,7 @@ \example webenginewidgets/simplebrowser \title WebEngine Widgets Simple Browser Example \ingroup webengine-widgetexamples - \brief A simple browser based on Qt WebEngine Widgets + \brief A simple browser based on Qt WebEngine Widgets. \image simplebrowser.png diff --git a/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc b/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc index f1fdf85d1..b4db10836 100644 --- a/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc +++ b/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc @@ -29,7 +29,7 @@ \example webenginewidgets/stylesheetbrowser \title WebEngine StyleSheet Browser Example \ingroup webengine-widgetexamples - \brief Demonstrates how to inject CSS into web pages using user scripts + \brief Demonstrates how to inject CSS into web pages using user scripts. \image stylesheetbrowser.png diff --git a/examples/webenginewidgets/videoplayer/doc/src/videoplayer.qdoc b/examples/webenginewidgets/videoplayer/doc/src/videoplayer.qdoc index 886b7f732..9f6add6ae 100644 --- a/examples/webenginewidgets/videoplayer/doc/src/videoplayer.qdoc +++ b/examples/webenginewidgets/videoplayer/doc/src/videoplayer.qdoc @@ -29,7 +29,7 @@ \example webenginewidgets/videoplayer \title WebEngine Widgets Video Player Example \ingroup webengine-widgetexamples - \brief Displays full screen video using \l QWebEngineView + \brief Displays full screen video using \l QWebEngineView. \image videoplayer-example.png |