diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-23 09:36:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-23 09:36:42 +0200 |
| commit | 36feb681a97b3dd690a54d2eafd58081036992f1 (patch) | |
| tree | d9f908d943ebc545e4c5584a24cee47414cd4b0d /src/webengine/api/qquickwebenginesettings.cpp | |
| parent | 7d6c94db4c42339ca2948be802f2579ba5522f58 (diff) | |
| parent | ec84507898e58a167b185ba674acf300cc695380 (diff) | |
Merge remote-tracking branch 'origin/5.6.2' into 5.6
Change-Id: I3e152ee134ed38628d1bf9571df58f469b29e74b
Diffstat (limited to 'src/webengine/api/qquickwebenginesettings.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginesettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index 92141704c..bcb461ffd 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -235,7 +235,7 @@ bool QQuickWebEngineSettings::fullScreenSupportEnabled() const } /*! - \qmlproperty QString WebEngineSettings::defaultTextEncoding + \qmlproperty string WebEngineSettings::defaultTextEncoding \since QtWebEngine 1.2 Sets the default encoding. The value must be a string describing an encoding such as "utf-8" or |