diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-24 06:47:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-24 06:47:37 +0200 |
| commit | 712c1078dc8008445b95e09611f10670ae3d307f (patch) | |
| tree | 6449248f027a943ca88190d888aea8ed417e85a6 /src/webengine/api/qquickwebenginesettings.cpp | |
| parent | a301473c4bd2a2956ea4986679b4a80f01bce2d9 (diff) | |
| parent | 36feb681a97b3dd690a54d2eafd58081036992f1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/webengine/api/qquickwebenginesettings.cpp
Change-Id: Ib7e2a7558c685410c49c455218d3b9c30f32358f
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 09fb2b98d..b12e59576 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -304,7 +304,7 @@ bool QQuickWebEngineSettings::touchIconsEnabled() 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 |