summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@digia.com>2014-03-21 12:37:07 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-25 11:26:48 +0100
commit160e07ca411315f2c46cfecdabcce40fddb53976 (patch)
tree47270e96eded4279a1a57f42cf085a7d21f2be2d
parent76fd59abac8021c7ccb4912461ad0ef533b4b9f9 (diff)
downloadqtwebkit-160e07ca411315f2c46cfecdabcce40fddb53976.tar.gz
Mention default encoding for QML WebView loadHtml method in docs.
The fact that the html string will be implicitly converted to UTF-16 led to some errors with loaded resources. Task-number: QTBUG-36656 Change-Id: I6ed36e2e814034cfccb4082c24e3327674e04cdf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
-rw-r--r--Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
index c3cc68a7b..a8dc93c98 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
@@ -2185,6 +2185,10 @@ void QQuickWebView::handleFlickableMouseRelease(const QPointF& position, qint64
and that was the base url, then an image referenced with the relative url \c diagram.png
would be looked for at \c{http://www.example.com/documents/diagram.png}.
+ It is important to keep in mind that the \a html string will be converted to UTF-16
+ internally. Textual resources, such as scripts or style sheets, will be treated as
+ UTF-16 as well, unless they have an explicit charset property in their referencing tag.
+
If an \a unreachableUrl is passed it is used as the url for the loaded
content. This is typically used to display error pages for a failed
load.