Reuse qwebenginesettings from core in qml

Drop duplicated enums. Use qwebenginesettings as private
for qquickwebenginesettings. This can most likely
be more optimized when profile is moved to core.

Change-Id: I04bdc6c5a35556bf6d38a273cefeeee9d2a0a310
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 9 insertions, 7 deletions

diff --git a/src/core/api/qwebenginesettings.h b/src/core/api/qwebenginesettings.h
index 3b98c0fd7..f565f8ee2 100644
--- a/src/core/api/qwebenginesettings.h
+++ b/src/core/api/qwebenginesettings.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
@@ -65,6 +65,7 @@ public:
         FantasyFont,
         PictographFont
     };
+
     enum WebAttribute {
         AutoLoadImages,
         JavascriptEnabled,
@@ -107,6 +108,7 @@ public:
     };
 
     enum UnknownUrlSchemePolicy {
+        InheritedUnknownUrlSchemePolicy = 0, // TODO: hide
         DisallowUnknownUrlSchemes = 1,
         AllowUnknownUrlSchemesFromUserInteraction,
         AllowAllUnknownUrlSchemes
@@ -114,7 +116,8 @@ public:
 
     //TODO: see if we still need it
     //static QWebEngineSettings *defaultSettings();
-
+public:
+    ~QWebEngineSettings();
     void setFontFamily(FontFamily which, const QString &family);
     QString fontFamily(FontFamily which) const;
     void resetFontFamily(FontFamily which);
@@ -135,16 +138,15 @@ public:
     void resetUnknownUrlSchemePolicy();
 
 private:
+    explicit QWebEngineSettings(QWebEngineSettings *parentSettings = nullptr);
+    void setParentSettings(QWebEngineSettings *parentSettings);
     Q_DISABLE_COPY(QWebEngineSettings)
     typedef ::QtWebEngineCore::WebEngineSettings QWebEngineSettingsPrivate;
-    QWebEngineSettingsPrivate* d_func() { return d_ptr.data(); }
-    const QWebEngineSettingsPrivate* d_func() const { return d_ptr.data(); }
     QScopedPointer<QWebEngineSettingsPrivate> d_ptr;
     friend class QWebEnginePagePrivate;
     friend class QWebEngineProfilePrivate;
-
-    ~QWebEngineSettings();
-    explicit QWebEngineSettings(QWebEngineSettings *parentSettings = Q_NULLPTR);
+    friend class QQuickWebEngineSettings;
+    friend class QtWebEngineCore::WebEngineSettings;
 };
 
 QT_END_NAMESPACE