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 /src/webengine/api/qtwebengineglobal.cpp | |
| 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 'src/webengine/api/qtwebengineglobal.cpp')
| -rw-r--r-- | src/webengine/api/qtwebengineglobal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webengine/api/qtwebengineglobal.cpp b/src/webengine/api/qtwebengineglobal.cpp index d181f44aa..a11618dba 100644 --- a/src/webengine/api/qtwebengineglobal.cpp +++ b/src/webengine/api/qtwebengineglobal.cpp @@ -54,9 +54,9 @@ namespace QtWebEngine { \ingroup qtwebengine-namespaces \keyword QtWebEngine Namespace - \brief Helper functions for the Qt WebEngine (Qt Quick) module. + \brief Helper functions for the \QWE (Qt Quick) module. - The \l[CPP]{QtWebEngine} namespace is part of the Qt WebEngine module. + The \l[CPP]{QtWebEngine} namespace is part of the \QWE module. */ /*! |