diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-22 12:34:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-22 12:44:57 +0200 |
| commit | 05c6c1b59d59113b81fcb4a5a0388ef98d39ed40 (patch) | |
| tree | af152f5ace10bdc5996ac0fb7cc7fd897928d60a /src/webenginewidgets/doc/src | |
| parent | 73eb8fb2ddaa44cd0e8a5dac68cbc1b66f618e0e (diff) | |
| parent | 9fdc847c639ef7060a13b10d9fe704e40357a0a8 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/webengine/api/qquickwebenginesettings_p.h
src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
Change-Id: I9cac7059557084a575af02782af886f55a8d404f
Diffstat (limited to 'src/webenginewidgets/doc/src')
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index 06ed10b30..facc0e8e6 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -165,9 +165,9 @@ \value AllowWindowActivationFromJavaScript Allows the window.focus() method in JavaScript. Disallowed by default. (Added in Qt 5.10) - \value HideScrollbars - Hides scrollbars. - Disabled by default. (Added in Qt 5.10) + \value ShowScrollBars + Shows scroll bars. + Enabled by default. (Added in Qt 5.10) */ /*! |