Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

3 files changed, 9 insertions, 8 deletions

diff --git a/Source/WebKit/qt/docs/qtwebkit.qdoc b/Source/WebKit/qt/docs/qtwebkit.qdoc
index 188833900..5276f0170 100644
--- a/Source/WebKit/qt/docs/qtwebkit.qdoc
+++ b/Source/WebKit/qt/docs/qtwebkit.qdoc
@@ -3,8 +3,6 @@
     \title Qt WebKit Widgets C++ Classes
     \brief Provides a web browser engine as well as C++ classes to render and
     interact with web content
-    \ingroup modules
-    \qtvariable webkit
 
     To include the definitions of the module's classes, use the
     following directive:
@@ -59,6 +57,9 @@
     made fully editable to the user through the use of the \c{contenteditable}
     attribute on HTML elements.
 
+    QtWebKit has been enhanced to become more attractive on the mobile front as well.
+    For more information see \l{QtWebKit Goes Mobile}.
+
     Qt WebKit is based on the Open Source WebKit engine. More information about
     WebKit itself can be found on the \l{WebKit Open Source Project} Web site.
 
@@ -80,8 +81,8 @@
     on many platforms due to the size of the WebKit engine. We recommend
     building the module only in release mode for embedded platforms.
     Currently Qt WebKit will always be compiled without debugging symbols
-    when using gcc. Take a look at the last lines of
-    \c{src/3rdparty/webkit/Source/WebCore/WebCore.pro} if you need to change this.
+    when using gcc. Take a look at 
+    \c{Tools/mkspecs/features/production_build.prf} if you need to change this.
 
     \note Web site icons, also known as "FavIcons", are currently not supported
     on Windows. We plan to address this in a future release.
@@ -192,7 +193,7 @@
     \section1 License Information
 
     This is a snapshot of the Qt port of WebKit. The exact version information
-    can be found in the \c{src/3rdparty/webkit/VERSION} file supplied with Qt.
+    can be found in the \c{VERSION} file supplied with Qt.
 
     Qt Commercial Edition licensees that wish to distribute applications that
     use the Qt WebKit module need to be aware of their obligations under the
diff --git a/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc b/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc
index 69814b023..d4fc2bd85 100644
--- a/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc
+++ b/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc
@@ -1,8 +1,8 @@
 //! [0]
-QT += webkitwidgets
+QT += webkit
 //! [0]
 
 
 //! [1]
-#include <QtWebKitWidgets>
+#include <QtWebKit>
 //! [1]
diff --git a/Source/WebKit/qt/docs/webkitsnippets/simple/main.cpp b/Source/WebKit/qt/docs/webkitsnippets/simple/main.cpp
index 926757b5a..408630eb1 100644
--- a/Source/WebKit/qt/docs/webkitsnippets/simple/main.cpp
+++ b/Source/WebKit/qt/docs/webkitsnippets/simple/main.cpp
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
     QWidget *parent = 0;
 //! [Using QWebView]
     QWebView *view = new QWebView(parent);
-    view->load(QUrl("http://qt-project.org"));
+    view->load(QUrl("http://qt.nokia.com/"));
     view->show();
 //! [Using QWebView]
     return app.exec();