Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef

Doc fixes from Alexis :)

4 files changed, 13 insertions, 5 deletions

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 17ba8d7..4c476d0 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-e32cb21d4f1787147bcb681883b96a95f867749a
+515aae71494436816cd0250cdc52caa4f2566aef
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 6ba3221..4cf9463 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
 
 and has the sha1 checksum
 
-        e32cb21d4f1787147bcb681883b96a95f867749a
+        515aae71494436816cd0250cdc52caa4f2566aef
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"