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

23 files changed, 96 insertions, 106 deletions

diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
index db4bbf82c..02d3df652 100644
--- a/src/buildtools/gn.pro
+++ b/src/buildtools/gn.pro
@@ -3,10 +3,8 @@ option(host_build)
 
 !debug_and_release: CONFIG += release
 
-isQtMinimum(5, 8) {
-    include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
-    QT_FOR_CONFIG += webengine-private
-}
+include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
+QT_FOR_CONFIG += webengine-private
 
 build_pass|!debug_and_release {
     !qtConfig(system-gn): CONFIG(release, debug|release) {
diff --git a/src/buildtools/ninja.pro b/src/buildtools/ninja.pro
index 1b17c6dfa..c99513f85 100644
--- a/src/buildtools/ninja.pro
+++ b/src/buildtools/ninja.pro
@@ -2,10 +2,9 @@ TEMPLATE = aux
 
 !debug_and_release: CONFIG += release
 
-isQtMinimum(5, 8) {
-    include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
-    QT_FOR_CONFIG += webengine-private
-}
+include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
+QT_FOR_CONFIG += webengine-private
+
 
 build_pass|!debug_and_release {
     !qtConfig(system-ninja): CONFIG(release, debug|release) {
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index ce7364ff9..2aa3c614d 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -13,37 +13,33 @@ gn_args += \
     treat_warnings_as_errors=false \
     enable_swiftshader=false
 
-use?(printing) {
+qtConfig(printing-and-pdf) {
     gn_args += enable_basic_printing=true enable_print_preview=true
-} else {
-    gn_args += enable_basic_printing=false enable_print_preview=false
-}
-
-use?(pdf) {
     gn_args += enable_pdf=true
 } else {
+    gn_args += enable_basic_printing=false enable_print_preview=false
     gn_args += enable_pdf=false
 }
 
-use?(pepper_plugins) {
+qtConfig(pepper-plugins) {
     gn_args += enable_plugins=true enable_widevine=true
 } else {
     gn_args += enable_plugins=false enable_widevine=false
 }
 
-use?(spellchecker) {
+qtConfig(spellchecker) {
     gn_args += enable_spellcheck=true
 } else {
     gn_args += enable_spellcheck=false
 }
 
-use?(webrtc) {
+qtConfig(webrtc) {
     gn_args += enable_webrtc=true
 } else {
     gn_args += enable_webrtc=false
 }
 
-use?(proprietary_codecs): gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
+qtConfig(proprietary-codecs): gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
 
 CONFIG(release, debug|release) {
     force_debug_info {
@@ -63,4 +59,4 @@ CONFIG(debug, debug|release) {
 !v8base_debug: gn_args += remove_v8base_debug_symbols=true
 
 # Compiling with -Os makes a huge difference in binary size
-contains(WEBENGINE_CONFIG, reduce_binary_size): gn_args += optimize_for_size=true
+optimize_size: gn_args += optimize_for_size=true
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
index 4d3f923e1..70f1cf81e 100644
--- a/src/core/config/desktop_linux.pri
+++ b/src/core/config/desktop_linux.pri
@@ -5,8 +5,4 @@ gn_args += \
     enable_session_service=false \
     toolkit_views=false
 
-use?(icecc) {
-    gn_args += use_debug_fission=false
-}
-
 !use_gold_linker: gn_args += use_gold=false
diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
index e48f1fc12..8d9f09deb 100644
--- a/src/core/config/embedded_linux.pri
+++ b/src/core/config/embedded_linux.pri
@@ -11,7 +11,3 @@ gn_args += \
     ozone_platform_external=true \
     ozone_platform=\"qt\" \
     toolkit_views=false
-
-use?(icecc) {
-    gn_args += use_debug_fission=false
-}
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index c0f2f6289..a2361b02f 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -8,17 +8,10 @@ gn_args += \
     use_gio=false \
     use_gnome_keyring=false \
     use_kerberos=false \
-    linux_use_bundled_binutils=false
+    linux_use_bundled_binutils=false \
+    use_nss_certs=true \
+    use_openssl_certs=false
 
-use?(nss) {
-    gn_args += \
-        use_nss_certs=true \
-        use_openssl_certs=false
-} else {
-    gn_args += \
-        use_nss_certs=false \
-        use_openssl_certs=true
-}
 gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): gn_args += no_delete_null_pointer_checks=true
 
 clang {
@@ -119,15 +112,15 @@ host_build {
         # Strip '>2 /dev/null' from $$pkgConfigExecutable()
         PKGCONFIG = $$first($$list($$pkgConfigExecutable()))
         gn_args += pkg_config=\"$$PKGCONFIG\"
-        gn_args += "host_pkg_config=\"pkg-config\""
+        gn_args += host_pkg_config=\"pkg-config\"
     }
 
-    qtConfig(system-zlib): use?(system_minizip): gn_args += use_system_zlib=true use_system_minizip=true
-    use?(system_libpng): gn_args += use_system_libpng=true
+    qtConfig(system-zlib): qtConfig(system-minizip): gn_args += use_system_zlib=true use_system_minizip=true
+    qtConfig(webengine-system-png): gn_args += use_system_libpng=true
     qtConfig(system-jpeg): gn_args += use_system_libjpeg=true
     qtConfig(system-freetype): gn_args += use_system_freetype=true
-    use?(system_harfbuzz): gn_args += use_system_harfbuzz=true
-    !use?(glib): gn_args += use_glib=false
+    qtConfig(webengine-system-harfbuzz): gn_args += use_system_harfbuzz=true
+    qtConfig(system-glib): gn_args += use_glib=false
     qtConfig(pulseaudio) {
         gn_args += use_pulseaudio=true
     } else {
@@ -143,15 +136,18 @@ host_build {
     !packagesExist(libpci): gn_args += use_libpci=false
     !packagesExist(xscrnsaver): gn_args += use_xscrnsaver=false
 
-    use?(system_libevent): gn_args += use_system_libevent=true
-    use?(system_libwebp):  gn_args += use_system_libwebp=true
-    use?(system_libxslt):  gn_args += use_system_libxml=true use_system_libxslt=true
-    #use?(system_jsoncpp):  gn_args += use_system_jsoncpp=true
-    use?(system_opus):     gn_args += use_system_opus=true
-    use?(system_snappy):   gn_args += use_system_snappy=true
-    use?(system_libvpx):   gn_args += use_system_libvpx=true
-    use?(system_icu):      gn_args += use_system_icu=true icu_use_data_file=false
-    use?(system_ffmpeg):   gn_args += use_system_ffmpeg=true
-    use?(system_re2):      gn_args += use_system_re2=true
-    #use?(system_protobuf): gn_args += use_system_protobuf=true
+    qtConfig(system-libevent): gn_args += use_system_libevent=true
+    qtConfig(system-libwebp): gn_args += use_system_libwebp=true
+    qtConfig(system-libxml2): gn_args += use_system_libxml=true use_system_libxslt=true
+    qtConfig(system-opus): gn_args += use_system_opus=true
+    qtConfig(system-snappy):   gn_args += use_system_snappy=true
+    qtConfig(system-libvpx):   gn_args += use_system_libvpx=true
+    qtConfig(system-icu): gn_args += use_system_icu=true icu_use_data_file=false
+    qtConfig(system-ffmpeg): gn_args += use_system_ffmpeg=true
+    qtConfig(system-re2):      gn_args += use_system_re2=true
+
+    # FIXME:
+    #qtConfig(system-protobuf): gn_args += use_system_protobuf=true
+    #qtConfig(system-jsoncpp):  gn_args += use_system_jsoncpp=true
+    #qtConfig(system-libsrtp: gn_args += use_system_libsrtp=true
 }
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index ddb397565..57f301f18 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -32,9 +32,9 @@ gn_args += \
     toolkit_views=false \
     use_external_popup_menu=false
 
-use?(spellchecker) {
-    use?(native_spellchecker): gn_args += use_browser_spellchecker=true
+qtConfig(spellchecker) {
+    qtConfig(native-spellchecker): gn_args += use_browser_spellchecker=true
     else: gn_args += use_browser_spellchecker=false
 } else {
-    macos: gn_args += use_browser_spellchecker=false
+    gn_args += use_browser_spellchecker=false
 }
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index b9e89200d..a422c63a3 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -46,7 +46,7 @@
 #if BUILDFLAG(ENABLE_SPELLCHECK)
 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
 #if BUILDFLAG(USE_BROWSER_SPELLCHECKER)
-#include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h"
+#include "components/spellcheck/browser/spellcheck_message_filter_platform.h"
 #endif
 #endif
 #include "content/browser/renderer_host/render_view_host_delegate.h"
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index 41aa2f193..6b43b08b7 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -28,7 +28,7 @@ RCC_DIR = $$OUT_PWD/$$getConfigDir()/.rcc
 
 # Assume that we want mobile touch and low-end hardware behaviors
 # whenever we are cross compiling.
-contains(WEBENGINE_CONFIG, embedded_build): DEFINES += QTWEBENGINE_EMBEDDED_SWITCHES
+qtConfig(embedded): DEFINES += QTWEBENGINE_EMBEDDED_SWITCHES
 
 qtConfig(egl): CONFIG += egl
 
@@ -194,13 +194,8 @@ HEADERS = \
         web_event_factory.h \
         webui/webui_controller_factory_qt.h
 
+qtConfig(pepper-plugins) {
 
-use?(pdf) {
-    SOURCES += pdfium_document_wrapper_qt.cpp
-    HEADERS += pdfium_document_wrapper_qt.h
-}
-
-use?(pepper_plugins) {
     SOURCES += \
         renderer_host/pepper/pepper_flash_browser_host_qt.cpp \
         renderer_host/pepper/pepper_host_factory_qt.cpp \
@@ -216,7 +211,8 @@ use?(pepper_plugins) {
         renderer/pepper/pepper_renderer_host_factory_qt.h
 }
 
-use?(printing) {
+qtConfig(printing-and-pdf) {
+
     SOURCES += \
         printing_message_filter_qt.cpp \
         print_view_manager_base_qt.cpp \
@@ -228,6 +224,10 @@ use?(printing) {
         print_view_manager_base_qt.h \
         print_view_manager_qt.h \
         renderer/print_web_view_helper_delegate_qt.h
+
+    # pdf sources
+    SOURCES += pdfium_document_wrapper_qt.cpp
+    HEADERS += pdfium_document_wrapper_qt.h
 }
 
 contains(QT_CONFIG, opengl) {
diff --git a/src/core/core_generator.pro b/src/core/core_generator.pro
index 916c211f9..cbf126dda 100644
--- a/src/core/core_generator.pro
+++ b/src/core/core_generator.pro
@@ -1,3 +1,6 @@
+include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
+QT_FOR_CONFIG += webengine-private
+
 include(core_gn_config.pri)
 
 TEMPLATE = lib
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index 1a5b66867..55b20cda2 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -1,3 +1,6 @@
+include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
+QT_FOR_CONFIG += webengine-private
+
 MODULE = webenginecore
 
 include(core_common.pri)
@@ -110,7 +113,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat
         resources.path = $$[QT_INSTALL_DATA]/resources
         INSTALLS += locales resources
 
-        !use?(system_icu) {
+        !qtConfig(system-icu) {
             icu.CONFIG += no_check_exist
             icu.path = $$[QT_INSTALL_DATA]/resources
             INSTALLS += icu
@@ -122,7 +125,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat
         # Copy essential files to the qtbase build directory for non-prefix builds
         #
 
-        !use?(system_icu) {
+        !qtConfig(system-icu) {
             COPIES += icu
         }
 
diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
index ee4e7892e..c565b99a4 100644
--- a/src/core/gn_run.pro
+++ b/src/core/gn_run.pro
@@ -1,7 +1,5 @@
-isQtMinimum(5, 8) {
-    include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
-    QT_FOR_CONFIG += webengine-private
-}
+include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
+QT_FOR_CONFIG += webengine-private
 
 TEMPLATE = aux
 
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp
index 7b9c1225d..44ecaf2ef 100644
--- a/src/core/web_engine_settings.cpp
+++ b/src/core/web_engine_settings.cpp
@@ -248,7 +248,7 @@ void WebEngineSettings::initDefaults()
         s_defaultAttributes.insert(PluginsEnabled, false);
         s_defaultAttributes.insert(FullScreenSupportEnabled, false);
         s_defaultAttributes.insert(ScreenCaptureEnabled, false);
-        s_defaultAttributes.insert(HideScrollbars, false);
+        s_defaultAttributes.insert(ShowScrollBars, true);
         // The following defaults matches logic in render_view_host_impl.cc
         // But first we must ensure the WebContext has been initialized
         QtWebEngineCore::WebEngineContext::current();
@@ -352,7 +352,7 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p
     prefs->should_print_backgrounds = testAttribute(PrintElementBackgrounds);
     prefs->allow_running_insecure_content = testAttribute(AllowRunningInsecureContent);
     prefs->allow_geolocation_on_insecure_origins = testAttribute(AllowGeolocationOnInsecureOrigins);
-    prefs->hide_scrollbars = testAttribute(HideScrollbars);
+    prefs->hide_scrollbars = !testAttribute(ShowScrollBars);
 
     // Fonts settings.
     prefs->standard_font_family_map[content::kCommonScript] = toString16(fontFamily(StandardFont));
diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h
index d4c5e02a8..ea647a61f 100644
--- a/src/core/web_engine_settings.h
+++ b/src/core/web_engine_settings.h
@@ -85,7 +85,7 @@ public:
         AllowRunningInsecureContent,
         AllowGeolocationOnInsecureOrigins,
         AllowWindowActivationFromJavaScript,
-        HideScrollbars
+        ShowScrollBars
     };
 
     // Must match the values from the public API in qwebenginesettings.h.
diff --git a/src/src.pro b/src/src.pro
index d9b57615d..1cd23f9fa 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,3 +1,6 @@
+include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
+QT_FOR_CONFIG += webengine-private
+
 TEMPLATE = subdirs
 
 process.depends = core
@@ -17,20 +20,20 @@ SUBDIRS += buildtools \
            plugins
 
 
-use?(spellchecker):!use?(native_spellchecker):!cross_compile {
+qtConfig(spellchecker):!qtConfig(native-spellchecker):!cross_compile {
     SUBDIRS += qwebengine_convert_dict
     qwebengine_convert_dict.subdir = tools/qwebengine_convert_dict
     qwebengine_convert_dict.depends = core
 }
 
-isQMLTestSupportApiEnabled() {
+qtConfig(testsupport) {
     webengine_testsupport_plugin.subdir = webengine/plugin/testsupport
     webengine_testsupport_plugin.target = sub-webengine-testsupport-plugin
     webengine_testsupport_plugin.depends = webengine
     SUBDIRS += webengine_testsupport_plugin
 }
 
-!contains(WEBENGINE_CONFIG, no_ui_delegates) {
+qtConfig(ui-delegates) {
     SUBDIRS += webengine/ui \
                webengine/ui2
 }
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index 44bd308ca..fa73af8b2 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webengine/api/qquickwebenginesettings.cpp
@@ -388,13 +388,13 @@ bool QQuickWebEngineSettings::allowWindowActivationFromJavaScript() const
 }
 
 /*!
-  \qmlproperty bool WebEngineSettings::hideScrollbars
+  \qmlproperty bool WebEngineSettings::showScrollBars
   \since QtWebEngine 1.6
-  Hides scrollbars. Disabled by default.
+  Shows scroll bars. Enabled by default.
 */
-bool QQuickWebEngineSettings::hideScrollbars() const
+bool QQuickWebEngineSettings::showScrollBars() const
 {
-    return d_ptr->testAttribute(WebEngineSettings::HideScrollbars);
+    return d_ptr->testAttribute(WebEngineSettings::ShowScrollBars);
 }
 
 /*!
@@ -623,12 +623,12 @@ void QQuickWebEngineSettings::setAllowWindowActivationFromJavaScript(bool on)
         Q_EMIT allowWindowActivationFromJavaScriptChanged();
 }
 
-void QQuickWebEngineSettings::setHideScrollbars(bool on)
+void QQuickWebEngineSettings::setShowScrollBars(bool on)
 {
-    bool wasOn = d_ptr->testAttribute(WebEngineSettings::HideScrollbars);
-    d_ptr->setAttribute(WebEngineSettings::HideScrollbars, on);
+    bool wasOn = d_ptr->testAttribute(WebEngineSettings::ShowScrollBars);
+    d_ptr->setAttribute(WebEngineSettings::ShowScrollBars, on);
     if (wasOn != on)
-        Q_EMIT hideScrollbarsChanged();
+        Q_EMIT showScrollBarsChanged();
 }
 
 void QQuickWebEngineSettings::setUnknownUrlSchemePolicy(QQuickWebEngineSettings::UnknownUrlSchemePolicy policy)
diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h
index 234763ecf..8a405fcd3 100644
--- a/src/webengine/api/qquickwebenginesettings_p.h
+++ b/src/webengine/api/qquickwebenginesettings_p.h
@@ -87,7 +87,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSettings : public QObject {
     Q_PROPERTY(bool allowRunningInsecureContent READ allowRunningInsecureContent WRITE setAllowRunningInsecureContent NOTIFY allowRunningInsecureContentChanged REVISION 3 FINAL)
     Q_PROPERTY(bool allowGeolocationOnInsecureOrigins READ allowGeolocationOnInsecureOrigins WRITE setAllowGeolocationOnInsecureOrigins NOTIFY allowGeolocationOnInsecureOriginsChanged REVISION 4 FINAL)
     Q_PROPERTY(bool allowWindowActivationFromJavaScript READ allowWindowActivationFromJavaScript WRITE setAllowWindowActivationFromJavaScript NOTIFY allowWindowActivationFromJavaScriptChanged REVISION 5 FINAL)
-    Q_PROPERTY(bool hideScrollbars READ hideScrollbars WRITE setHideScrollbars NOTIFY hideScrollbarsChanged REVISION 5 FINAL)
+    Q_PROPERTY(bool showScrollBars READ showScrollBars WRITE setShowScrollBars NOTIFY showScrollBarsChanged REVISION 5 FINAL)
     Q_PROPERTY(UnknownUrlSchemePolicy unknownUrlSchemePolicy READ unknownUrlSchemePolicy WRITE setUnknownUrlSchemePolicy NOTIFY unknownUrlSchemePolicyChanged REVISION 5 FINAL)
 
 public:
@@ -125,7 +125,7 @@ public:
     bool allowRunningInsecureContent() const;
     bool allowGeolocationOnInsecureOrigins() const;
     bool allowWindowActivationFromJavaScript() const;
-    bool hideScrollbars() const;
+    bool showScrollBars() const;
     UnknownUrlSchemePolicy unknownUrlSchemePolicy() const;
 
     void setAutoLoadImages(bool on);
@@ -152,7 +152,7 @@ public:
     void setAllowRunningInsecureContent(bool on);
     void setAllowGeolocationOnInsecureOrigins(bool on);
     void setAllowWindowActivationFromJavaScript(bool on);
-    void setHideScrollbars(bool on);
+    void setShowScrollBars(bool on);
     void setUnknownUrlSchemePolicy(UnknownUrlSchemePolicy policy);
 
 signals:
@@ -180,7 +180,7 @@ signals:
     Q_REVISION(3) void allowRunningInsecureContentChanged();
     Q_REVISION(4) void allowGeolocationOnInsecureOriginsChanged();
     Q_REVISION(5) void allowWindowActivationFromJavaScriptChanged();
-    Q_REVISION(5) void hideScrollbarsChanged();
+    Q_REVISION(5) void showScrollBarsChanged();
     Q_REVISION(5) void unknownUrlSchemePolicyChanged();
 
 private:
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index 047737254..e9abec02e 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -48,7 +48,6 @@
 #include <QVariant>
 #include <QWindow>
 #include <private/qquickwindow_p.h>
-#include <private/qsgcontext_p.h>
 
 namespace QtWebEngineCore {
 
diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro
index f4bc65edb..4b2170cbc 100644
--- a/src/webengine/webengine.pro
+++ b/src/webengine/webengine.pro
@@ -1,3 +1,6 @@
+include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
+QT_FOR_CONFIG += webengine-private
+
 TARGET = QtWebEngine
 
 # For our export macros
@@ -55,7 +58,7 @@ HEADERS = \
         render_widget_host_view_qt_delegate_quickwindow.h \
         ui_delegates_manager.h
 
-isQMLTestSupportApiEnabled() {
+qtConfig(testsupport) {
     QT += testlib
 
     SOURCES += api/qquickwebenginetestsupport.cpp
@@ -64,11 +67,11 @@ isQMLTestSupportApiEnabled() {
     DEFINES += ENABLE_QML_TESTSUPPORT_API
 }
 
-contains(WEBENGINE_CONFIG, use_spellchecker) {
+qtConfig(spellchecker) {
     DEFINES += ENABLE_SPELLCHECK
 }
 
-use?(pdf) {
+qtConfig(printing-and-pdf) {
     DEFINES += ENABLE_PDF
 }
 
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;
diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h
index dce86eedb..fc9372968 100644
--- a/src/webenginewidgets/api/qwebenginesettings.h
+++ b/src/webenginewidgets/api/qwebenginesettings.h
@@ -91,7 +91,7 @@ public:
         AllowRunningInsecureContent,
         AllowGeolocationOnInsecureOrigins,
         AllowWindowActivationFromJavaScript,
-        HideScrollbars
+        ShowScrollBars
     };
 
     enum FontSize {
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)
 */
 
 /*!
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index 96341d58c..29c961c80 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -1,3 +1,6 @@
+include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
+QT_FOR_CONFIG += webengine-private
+
 TARGET = QtWebEngineWidgets
 
 # For our export macros
@@ -44,23 +47,20 @@ HEADERS = \
         api/qwebengineview_p.h \
         render_widget_host_view_qt_delegate_widget.h
 
-!contains(WEBENGINE_CONFIG, no_ui_delegates) {
+qtConfig(ui-delegates) {
     SOURCES += ui/messagebubblewidget.cpp
     HEADERS += ui/messagebubblewidget_p.h
     DEFINES += QT_UI_DELEGATES
 }
 
-contains(WEBENGINE_CONFIG, use_spellchecker) {
+qtConfig(spellchecker) {
     DEFINES += ENABLE_SPELLCHECK
 }
 
-use?(printing) {
+qtConfig(printing-and-pdf) {
     DEFINES += ENABLE_PRINTING
-    QT += printsupport
-}
-
-use?(pdf) {
     DEFINES += ENABLE_PDF
+    QT += printsupport
 }
 
 load(qt_module)