diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-08 11:04:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-08 12:55:06 +0200 |
| commit | 22556f899ffd91650c1a1d5a8d71016358291859 (patch) | |
| tree | 320dfdcd26a3cd078738da5a0ab9b8ea373fde29 /src/webenginewidgets/api/qwebenginesettings.cpp | |
| parent | b715310a4fdc2a5e215c99bae042cd820e9a1e27 (diff) | |
| parent | dc16cdd60449112343d43852960142db7fd155fd (diff) | |
Merge branch '5.5' into 5.6
Change-Id: Idafba4d47393638cfc72fd02be092b67bb8cbd8c
Diffstat (limited to 'src/webenginewidgets/api/qwebenginesettings.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginesettings.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp index 1c45095b8..430d64185 100644 --- a/src/webenginewidgets/api/qwebenginesettings.cpp +++ b/src/webenginewidgets/api/qwebenginesettings.cpp @@ -99,6 +99,11 @@ QWebEngineSettings *QWebEngineSettings::globalSettings() } #endif +/*! + Returns the default settings for the web engine page. + + \sa globalSettings() +*/ QWebEngineSettings *QWebEngineSettings::defaultSettings() { return QWebEngineProfile::defaultProfile()->settings(); |