diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 09:16:35 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-09-18 12:25:20 +0000 |
| commit | 8365186b3fdc2f1eca7e015147688d23bfdf81e9 (patch) | |
| tree | bfb19e2240a7cbe55d8423ade20f5e3067c41be8 /src/webenginewidgets/doc | |
| parent | 858a468b77ed969333efe4985cb4a64d46c5c154 (diff) | |
| parent | fa179ff4ca2fdd07cce2aeb0780be202c57f2995 (diff) | |
Merge "Merge branch '5.10' into dev" into refs/staging/dev
Diffstat (limited to 'src/webenginewidgets/doc')
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 4 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 3b9300a4b..5248a383a 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -89,8 +89,8 @@ \c MainWorld. The \l {QWebEngineSettings::FocusOnNavigationEnabled} {FocusOnNavigationEnabled} setting can be - used to stop the view associated with the page from automatically receiving focus when a - navigation operation occurs (like loading or reloading a page or navigating through history). + used to make the view associated with the page automatically receive focus when a navigation + operation occurs (like loading or reloading a page or navigating through history). */ /*! diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index 907f6f643..e6a94281e 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -148,7 +148,7 @@ Gives focus to the view associated with the page, whenever a navigation operation occurs (load, stop, reload, reload and bypass cache, forward, backward, set content, and so on). - Enabled by default. (Added in Qt 5.8) + Disabled by default. (Added in Qt 5.8) \value PrintElementBackgrounds Turns on printing of CSS backgrounds when printing a web page. Enabled by default. (Added in Qt 5.8) |