diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-09 13:50:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-09 13:50:17 +0200 |
| commit | c9a64fda178c32ac924977ac93bf83d7e47767fe (patch) | |
| tree | beaf8671ccbce36b3d4018ce57fe9de29d40d87f /examples/webenginewidgets/simplebrowser | |
| parent | 10611866af8736a397371a38d6b5486ee8d28c62 (diff) | |
| parent | 44303861fd116b3a279d26300147e89a0bf8121c (diff) | |
Merge branch '5.12' into 5.13
Conflicts:
src/3rdparty
src/core/renderer/user_resource_controller.cpp
src/core/web_contents_adapter.cpp
src/webengine/doc/src/qtwebengine-overview.qdoc
Change-Id: I46be9d33b3b65d61dfa099ee72a3509afb9bd6a4
Diffstat (limited to 'examples/webenginewidgets/simplebrowser')
| -rw-r--r-- | examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc b/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc index b0c426232..b5ad13626 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 \QWE Widgets. \image simplebrowser.png @@ -267,7 +267,7 @@ Alternatively we could implement private browsing on the tab-level, with some tabs in a window in normal mode, others in private mode. - Implementing private browsing is quite easy using Qt WebEngine. All one has + Implementing private browsing is quite easy using \QWE. All one has to do is to create a new \l{QWebEngineProfile} and use it in the \l{QWebEnginePage} instead of the default profile. In the example this new profile is created and owned by the \c Browser object: |