diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-18 13:41:05 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-18 13:41:27 (GMT) |
| commit | 26bf653b5d3bb68900ddde05819cf476e918b3e9 (patch) | |
| tree | 7c9272e09b2cf64ea958c21a0f2261be4be00196 /src/3rdparty/webkit/WebKit/qt | |
| parent | d0b68442682382414527024b3e86f87dc8597c9c (diff) | |
| download | Qt-26bf653b5d3bb68900ddde05819cf476e918b3e9.zip Qt-26bf653b5d3bb68900ddde05819cf476e918b3e9.tar.gz Qt-26bf653b5d3bb68900ddde05819cf476e918b3e9.tar.bz2 | |
Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef
Doc fixes from Alexis :)
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/ChangeLog | 8 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index d77267b..3df2970 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,11 @@ +2010-06-18 Alexis Menard <alexis.menard@nokia.com> + + Reviewed by Simon Hausmann. + + [Qt] Fix documentation for the declarative module import. + + * declarative/qdeclarativewebview.cpp: + 2010-06-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Antti Koivisto. diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp index 263b42a..a349bec 100644 --- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp @@ -145,9 +145,9 @@ void GraphicsWebView::mouseMoveEvent(QGraphicsSceneMouseEvent* event) A WebView renders web content based on a URL. - This type is made available by importing the \c org.webkit module: + This type is made available by importing the \c QtWebKit module: - \bold{import org.webkit 1.0} + \bold{import QtWebKit 1.0} If the width and height of the item is not set, they will dynamically adjust to a size appropriate for the content. @@ -160,7 +160,7 @@ void GraphicsWebView::mouseMoveEvent(QGraphicsSceneMouseEvent* event) usually laying out the web content to fit the preferredWidth. \qml - import org.webkit 1.0 + import QtWebKit 1.0 WebView { url: "http://www.nokia.com" |