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/simplebrowser | |
| 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/simplebrowser')
| -rw-r--r-- | examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
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 |