diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-08-18 13:16:32 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-09-02 17:41:08 +0200 |
| commit | 0870cc93ad3240f5898f231c8f8b8fd82035206d (patch) | |
| tree | 1ac8192e88d84a2736531ae0b866dac5e6dcc630 /src/webenginewidgets | |
| parent | 9dbb161e3ce0933e9578d856277890d6469dc34d (diff) | |
Remove default qwebenginesettings getter
Remove defaultSettings() from qwebenginesettings and drop dependency on
qwebenigineprofile in qwebenginesettings, let's see if we can also
get rid of default profile later.
Remove deprecated method globalSettings().
Change-Id: Ibccca50af237ed6a3dd32137d34f8e7e0e7357f3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginesettings.cpp | 12 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginesettings.h | 6 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 9 |
3 files changed, 4 insertions, 23 deletions
diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp index d9fb3b000..f405921a6 100644 --- a/src/webenginewidgets/api/qwebenginesettings.cpp +++ b/src/webenginewidgets/api/qwebenginesettings.cpp @@ -38,8 +38,6 @@ ****************************************************************************/ #include "qwebenginesettings.h" - -#include "qwebengineprofile.h" #include "web_engine_settings.h" QT_BEGIN_NAMESPACE @@ -127,22 +125,16 @@ QWebEngineSettings::~QWebEngineSettings() { } -#if QT_DEPRECATED_SINCE(5, 5) -QWebEngineSettings *QWebEngineSettings::globalSettings() -{ - return defaultSettings(); -} -#endif - /*! Returns the settings for a web engine page that belongs to the default profile. All web pages not specifically created with another profile belong to the default profile. -*/ + QWebEngineSettings *QWebEngineSettings::defaultSettings() { return QWebEngineProfile::defaultProfile()->settings(); } +*/ ASSERT_ENUMS_MATCH(WebEngineSettings::StandardFont, QWebEngineSettings::StandardFont) ASSERT_ENUMS_MATCH(WebEngineSettings::FixedFont, QWebEngineSettings::FixedFont) diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h index d39291fed..5cc40723e 100644 --- a/src/webenginewidgets/api/qwebenginesettings.h +++ b/src/webenginewidgets/api/qwebenginesettings.h @@ -112,10 +112,8 @@ public: AllowAllUnknownUrlSchemes }; -#if QT_DEPRECATED_SINCE(5, 5) - static QWebEngineSettings *globalSettings(); -#endif - static QWebEngineSettings *defaultSettings(); + //TODO: see if we still need it + //static QWebEngineSettings *defaultSettings(); void setFontFamily(FontFamily which, const QString &family); QString fontFamily(FontFamily which) const; diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index b83da9440..e904b65ba 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -22,15 +22,6 @@ // by its LGPL license. Documentation written from scratch for new methods should be // placed inline in the code as usual. -#if QT_DEPRECATED_SINCE(5, 5) -/*! - \fn static QWebEngineSettings *QWebEngineSettings::globalSettings() - \obsolete - - Use defaultSettings() instead. -*/ -#endif - /*! \class QWebEngineSettings \since 5.4 |