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/webengine | |
| 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/webengine')
| -rw-r--r-- | examples/webengine/customdialogs/doc/src/customdialogs.qdoc | 2 | ||||
| -rw-r--r-- | examples/webengine/minimal/doc/src/minimal.qdoc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/webengine/customdialogs/doc/src/customdialogs.qdoc b/examples/webengine/customdialogs/doc/src/customdialogs.qdoc index 3fc888a77..5c550ed5e 100644 --- a/examples/webengine/customdialogs/doc/src/customdialogs.qdoc +++ b/examples/webengine/customdialogs/doc/src/customdialogs.qdoc @@ -29,7 +29,7 @@ \example webengine/customdialogs \title WebEngine Qt Quick Custom Dialogs Example \ingroup webengine-examples - \brief Customizes UI elements of Qt WebEngine's dialogs. + \brief Customizes UI elements of \QWE's dialogs. \image customdialogs.png diff --git a/examples/webengine/minimal/doc/src/minimal.qdoc b/examples/webengine/minimal/doc/src/minimal.qdoc index 8d12afc7c..4fc62bddb 100644 --- a/examples/webengine/minimal/doc/src/minimal.qdoc +++ b/examples/webengine/minimal/doc/src/minimal.qdoc @@ -29,7 +29,7 @@ \example webengine/minimal \title WebEngine Qt Quick Minimal Example \ingroup webengine-examples - \brief Displays a web page using the Qt Quick integration of Qt WebEngine. + \brief Displays a web page using the Qt Quick integration of \QWE. \image minimal-example.png @@ -52,7 +52,7 @@ In the \c main function we first set the \l{QCoreApplication::organizationName} property. This affects the locations - where Qt WebEngine stores persistent and cached data (see also + where \QWE stores persistent and cached data (see also \l{WebEngineProfile::cachePath} and \l{WebEngineProfile::persistentStoragePath}). |