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/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | |
| 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/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc')
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index f9ab710d1..c451344d2 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -440,7 +440,7 @@ /*! \fn void QWebEnginePage::triggerAction(WebAction action, bool checked = false) This function can be called to trigger the specified \a action. - It is also called by Qt WebEngine if the user triggers the action, for example + It is also called by \QWE if the user triggers the action, for example through a context menu item. If \a action is a checkable action, then \a checked specifies whether the action |