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