summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2014-08-12 10:06:25 +0200
committerAllan Sandfeld Jensen <allan.jensen@digia.com>2014-08-12 10:32:45 +0200
commiteb611b3f830cb4af80baabadc1f4e71f284ab786 (patch)
treefa83539a27acbd4fca8be33f60470cea575254c6
parent9548b912de9e4c11c3326708537c81d1b6861bfb (diff)
Fix case in documentation of qobjectbridge bindings
The method toDataURL does not work, but calling toDataUrl does. This patch updates the documentation to match the exported method name. Task-number: QTBUG-40268 Change-Id: Icf0ee233df141d43367da045834e6a42c9afb31a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r--Source/WebKit/qt/docs/qtwebkit-bridge.qdoc4
-rw-r--r--Source/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc b/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc
index c7b3c27e7..5db9e931c 100644
--- a/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc
+++ b/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc
@@ -360,8 +360,8 @@
\snippet webkitsnippets/qtwebkit_bridge_snippets.cpp 1
The JavaScript environment can then use the pixmap from Qt and display it inside the HTML environment,
- by assigning it to an existing \c{<img>} element with \c{assignToHTMLImageElement()}. It can also use the \c{toDataURL()} function,
- which allows using the pixmap as the \c{src} attribute of an image or as a \c{background-image} URL. Note that the \c{toDataURL()}
+ by assigning it to an existing \c{<img>} element with \c{assignToHTMLImageElement()}. It can also use the \c{toDataUrl()} function,
+ which allows using the pixmap as the \c{src} attribute of an image or as a \c{background-image} URL. Note that the \c{toDataUrl()}
function is costly and should be used with caution.
It can also use the \c{toImageData()} function to convert the pixmap to a JavaScript \c{ImageData} object.
diff --git a/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp b/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp
index 27018af33..14331d195 100644
--- a/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp
+++ b/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp
@@ -13,7 +13,7 @@ void wrapInFunction()
{
width: ...,
height: ...,
- toDataURL: function() { ... },
+ toDataUrl: function() { ... },
assignToHTMLImageElement: function(element) { ... }
toImageData: function() { ... }
}