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/api/qwebenginesettings.cpp | |
| 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/api/qwebenginesettings.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginesettings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp index 7696dc960..2d7c68926 100644 --- a/src/webenginewidgets/api/qwebenginesettings.cpp +++ b/src/webenginewidgets/api/qwebenginesettings.cpp @@ -99,8 +99,8 @@ static WebEngineSettings::Attribute toWebEngineAttribute(QWebEngineSettings::Web return WebEngineSettings::AllowGeolocationOnInsecureOrigins; case QWebEngineSettings::AllowWindowActivationFromJavaScript: return WebEngineSettings::AllowWindowActivationFromJavaScript; - case QWebEngineSettings::HideScrollbars: - return WebEngineSettings::HideScrollbars; + case QWebEngineSettings::ShowScrollBars: + return WebEngineSettings::ShowScrollBars; default: return WebEngineSettings::UnsupportedInCoreSettings; |