diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-18 14:42:00 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-18 14:42:00 +0200 |
| commit | ee2b1e71a80f88de90a03e10a89ba491ef99d308 (patch) | |
| tree | b14cd541a3f7ad1fc6739e0f5a02d479334b6b34 /src/webengine/api/qquickwebenginesettings.cpp | |
| parent | 61bdfb046700068afe36007ede3dcba1104099a3 (diff) | |
| parent | 7db354d1a21a17da76244b77c35d7297be3a86a9 (diff) | |
Merge branch '5.6' into 5.7
Change-Id: I490e0ee46d3ff040ca26426feb7e4d6ef7098f94
Diffstat (limited to 'src/webengine/api/qquickwebenginesettings.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginesettings.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index a5796c796..73d3e34b9 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -318,6 +318,7 @@ bool QQuickWebEngineSettings::touchIconsEnabled() const /*! \qmlproperty QString WebEngineSettings::defaultTextEncoding + \since QtWebEngine 1.2 Sets the default encoding. The value must be a string describing an encoding such as "utf-8" or "iso-8859-1". |