Add settings to WebEngineProfiles

This patch adds settings to profiles so common settings might be shared
among all pages in a profile. The former global settings are now replaced
by the settings of the default profile.

Change-Id: I544420e07beeb52ef29b2360bc7929402650cd07
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h
index 29825f5a4..48cc3107c 100644
--- a/src/webenginewidgets/api/qwebenginesettings.h
+++ b/src/webenginewidgets/api/qwebenginesettings.h
@@ -25,13 +25,13 @@
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qstring.h>
 
+class WebEngineSettings;
+
 QT_BEGIN_NAMESPACE
 
 class QIcon;
 class QPixmap;
 class QUrl;
-class QWebEngineSettingsPrivate;
-class QWebEngineGlobalSettings;
 
 class QWEBENGINEWIDGETS_EXPORT QWebEngineSettings {
 public:
@@ -66,7 +66,10 @@ public:
         DefaultFixedFontSize
     };
 
+#if QT_DEPRECATED_SINCE(5, 5)
     static QWebEngineSettings *globalSettings();
+#endif
+    static QWebEngineSettings *defaultSettings();
 
     void setFontFamily(FontFamily which, const QString &family);
     QString fontFamily(FontFamily which) const;
@@ -85,13 +88,15 @@ public:
 
 private:
     Q_DISABLE_COPY(QWebEngineSettings)
-    Q_DECLARE_PRIVATE(QWebEngineSettings);
+    typedef 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 QWebEngineGlobalSettings;
+    friend class QWebEngineProfilePrivate;
 
-    QWebEngineSettings();
     ~QWebEngineSettings();
+    explicit QWebEngineSettings(QWebEngineSettings *parentSettings = 0);
 };
 
 QT_END_NAMESPACE