Doc: Remove/replace references to Qt WebKit with Qt WebEngine.

Change-Id: Ib9dc85280091895223fb0b11cba219b6c3286fb8
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

15 files changed, 85 insertions, 174 deletions

diff --git a/doc/src/connectivity.qdoc b/doc/src/connectivity.qdoc
index c7deaec3..4da7198f 100644
--- a/doc/src/connectivity.qdoc
+++ b/doc/src/connectivity.qdoc
@@ -47,8 +47,8 @@ can start or stop network interfaces and roam between access points. It does
 however not take care of the network configurations itself. The platform needs
 to take care of that.
 
-\l{Qt WebKit} offers a web browser engine that makes it possible to use web
-content in your application. \l{Qt WebKit} can render HTML, XHTML,
+\l{Qt WebEngine} offers a Chromium-based web engine that enables using
+web content in your application. \l{Qt WebEngine} can render HTML5, XHTML,
 and SVG documents, and execute Javascript.
 
 Qt also offers functionalities for \e{inter-process communication} (IPC). The
@@ -116,11 +116,12 @@ in addition to several examples to demonstrate its use.
 \section1 World Wide Web Support
 
 Qt makes it easy to embed web content into your Qt application using features of
-the Qt WebKit layout engine. The Qt WebKit module equips Qt with support for a
-broad range of standard web technologies that make it possible to embed HTML
-content styled with CSS and scripted with JavaScript into your Qt application.
-\l{Qt WebKit} facilitates both integration with traditional QWidget based desktop
-applications as well as embedding into Qt Quick QML applications.
+the Qt WebEngine layout engine. The Qt WebEngine module equips Qt with support
+for a broad range of standard web technologies that make it possible to embed
+HTML content styled with CSS and scripted with JavaScript into your Qt
+application. \l{Qt WebEngine} facilitates both integration with traditional
+QWidget based desktop applications as well as embedding into Qt Quick QML
+applications.
 
 For more information see \l {Integrating Web Content}.
 
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 1e012ab3..0982b48f 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -84,8 +84,8 @@
         \li \l{Qt Quick}{QtQuick}
     \row
         \li \l{Qt Multimedia}{QtMultimedia}
-        \li \l{Qt WebKit}{QtWebKit}
-        \li \l{Qt WebKit Widgets}{QtWebKitWidgets}
+        \li \l{Qt WebEngine}{QtWebEngine}
+        \li \l{Qt WebEngine Widgets}{QtWebEngineWidgets}
         \li \l{Qt XML}{QtXml}
     \row
         \li \l{Qt XML Patterns}{QtXmlPatterns}
@@ -156,12 +156,6 @@
     More information can be found in the \l{Secure Sockets Layer (SSL) Classes}
     documentation.
 
-    \row    \li \l{QtWebKit}   \li WebKit
-    \li WebKit is licensed under the GNU LGPL version 2 or later.
-    This has implications for developers of closed source applications.
-    Please see the \l{Qt WebKit Widgets#License Information}{Qt WebKit Widgets}
-    documentation for more information.
-
     \endtable
 
     \section1 Platform-Specific Notes
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index d678a2b0..f7880de7 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -132,7 +132,6 @@
         \li \l{Qt WebEngine Examples}
         \li \l{Qt WebEngine Widgets Examples}
         \li \l{Qt WebSockets Examples}{WebSocket Examples}
-        \li \l{Qt WebKit Examples}{WebKit Examples}
         \endlist
     \enddiv
     \div {class="doc-column"}
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 98faf688..fcf0c918 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -280,3 +280,11 @@
     \externalpage http://doc.qt.io/emulator/index.html
     \title Emulator
 */
+/*!
+    \externalpage http://wiki.qt.io/QtWebEngine
+    \title Qt WebEngine Wiki
+*/
+/*!
+    \externalpage http://wiki.qt.io/QtWebEngineOnWindows
+    \title Qt WebEngine on Windows
+*/
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index 45f42431..e7522c9d 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -32,7 +32,7 @@
 
 Qt for Android enables you to run Qt 5 applications on devices with Android
 v2.3.3 (API level 10) or later. All Qt modules (essential and add-on) are
-supported except Qt WebKit, Qt Serial Port, and the
+supported except Qt WebEngine, Qt Serial Port, and the
 platform-specific ones (Qt Mac Extras, Qt Windows Extras, and Qt X11 Extras).
 
 The following list summarizes what you can do with Qt for Android:
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index 13871a0f..2680685d 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -339,26 +339,16 @@
     distributions; try searching for \c gstreamer or \c libgstreamer in your
     distribution's package repository to find suitable packages.
 
-    \section1 Qt WebKit Dependencies
+    \section1 Qt WebEngine Dependencies
 
-    \l{Qt WebKit} depends on some extra development tools in addition to those required for the rest of Qt.
+    \l{Qt WebEngine} depends on some extra development tools in addition to
+    those required for the rest of Qt.
 
     \note These dependencies are only needed if you use a source version of Qt.
           They are not required when using a prebuilt library.
 
-    \list
-        \li gperf
-        \li bison
-        \li flex (v2.5.33 or later)
-        \li sqlite (development version)
-        \li fontconfig (development version)
-        \li xrender (development version)
-        \li gstreamer (development version)
-    \endlist
-
-    These should be available in most major Linux distributions, but the exact install instructions will vary.
-
-    For the most up to date information about \l{Qt WebKit} dependencies, please refer to the \l{http://trac.webkit.org/wiki/BuildingQtOnLinux}{Qt WebKit wiki for Linux}
+    For the most up-to-date information about \l{Qt WebEngine} dependencies,
+    see the \l{Qt WebEngine Wiki}{Qt WebEngine} wiki.
 
 */
 
@@ -747,10 +737,6 @@
     within a specific subdirectory (such as \c imageformats or \c sqldrivers)
     within your distribution directory.
 
-    \note If you are deploying an application that uses \l{Qt WebKit} to display
-    HTML pages from the World Wide Web, you should include all text codec
-    plugins to support as many HTML encodings possible.
-
     The search path for Qt plugins (as well as a few other paths) is
     hard-coded into the QtCore library. By default, the first plugin
     search path will be hard-coded as \c /path/to/Qt/plugins. As
@@ -830,7 +816,7 @@
        mode.
     \li Versions 10.1.008 to 10.1.015 for both IA-32 and Intel 64 are
        known crash with "(0): internal error: 0_47021" when compiling
-       \l{Qt XML Patterns}, \l{Qt WebKit}, and \l{Qt Designer} in release mode. Version
+       \l{Qt XML Patterns} and \l{Qt Designer} in release mode. Version
        10.1.017 compiles these modules correctly in release mode.
     \endlist
 
diff --git a/doc/src/platforms/osx.qdoc b/doc/src/platforms/osx.qdoc
index 0f5ddde5..feb5bca7 100644
--- a/doc/src/platforms/osx.qdoc
+++ b/doc/src/platforms/osx.qdoc
@@ -1037,10 +1037,6 @@
     each type of plugin must be located within a specific subdirectory (such as
     \c imageformats or \c sqldrivers) in your distribution directory.
 
-    When deploying an application that uses Qt WebKit to display HTML pages from
-    the World Wide Web, you must include all text codec plugins to support as
-    many HTML encodings possible.
-
     The search path for Qt plugins (as well as a few other paths) is
     hard-coded into the QtCore library. By default, the first plugin
     search path will be hard-coded as \c /path/to/Qt/plugins. But
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index 449244df..8326b7a8 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -110,9 +110,8 @@
 
     \section1 Libraries
 
-    The following libraries may be used when running Qt 5 applications in Windows.
-    These are not mandatory, but some components (for example, Qt WebKit) may depend
-    on them.
+    The following third-party libraries may be used when running Qt 5
+    applications on Windows.
 
     \list
         \li \l{ICU}: Qt 5 can make use of the ICU library for enhanced UNICODE and Globalization
@@ -127,13 +126,7 @@
         \li \l{ANGLE}: This library converts OpenGL ES 2.0 API calls to DirectX 11 or DirectX 9
            calls (depending on availability), removing the need to install graphics drivers on
            the target machines.
-           Building the library requires the installation of the \l{Direct X SDK}.
-           More information is available at \l{http://code.google.com/p/angleproject/wiki/DevSetup}
-
-           \note When building for 64-bit environments, de-activate the
-           \c WarnAsError option in every project file, otherwise, integer
-           conversion warnings will break the build.
-    \endlist
+     \endlist
 
     Support for Secure Sockets Layer (SSL) communication is provided by the
     \l {OpenSSL Toolkit}, which must be obtained separately. See
@@ -142,13 +135,9 @@
 
     \section2 ICU
 
-    Qt WebKit, and applications using it, always need the ICU libraries. Qt Core
-    can be configured to either rely on ICU functionality, or fall back to Windows API
-    and internal algorithms with somewhat reduced functionality.
-
     From Qt 5.3 and onwards, configure does not link Qt Core against ICU libraries
     anymore by default. This reduces the size of a self-contained
-    application package considerably, as long as Qt WebKit is not used.
+    application package considerably.
 
     Letting Qt Core utilize the ICU libraries however has following advantages:
     \list
@@ -380,13 +369,7 @@
             (\l{http://www.activestate.com/activeperl}{download page}) and add
            the installation location to your \c PATH.
         \li Python - Install Python from the \l{http://www.python.org/download/}{here}
-           and add the installation location to your PATH in order to be able
-           to build Qt WebKit.
-
-        \li Install \l{http://www.ruby-lang.org}{Ruby} from \l{http://rubyinstaller.org/}{here}
-           and add the installation location to your PATH in order to be able
-           to build Qt WebKit.
-
+           and add the installation location to your PATH.
     \endlist
 
     \note Please make sure that the \c perl executable from ActivePerl is found
@@ -394,7 +377,7 @@
            latter is outdated.
 
 
-    Qt WebKit and ANGLE depend on these extra tools from the \l{GnuWin32 Project}{GnuWin32} and
+    ANGLE depends on these extra tools from the \l{GnuWin32 Project}{GnuWin32} and
     \l {http://sourceforge.net/projects/winflexbison/}{Win flex-bison}
     projects, which are provided for your convenience in the \e gnuwin32/bin
     folder:
@@ -442,8 +425,8 @@
 
     \endlist
 
-    For the most up to date information about the \l{Qt WebKit} dependencies,
-    please refer to the \l{http://trac.webkit.org/wiki/BuildingQtOnWindows}{Qt WebKit Wiki for Windows}.
+    For the most up-to-date information about the \l{Qt WebEngine} dependencies,
+    see the \l{Qt WebEngine on Windows}{Qt WebEngine} wiki for Windows.
 
 */
 
@@ -504,7 +487,7 @@
     The minimum version of MinGW-builds supported is GCC 4.7.2.
     \l{http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.7.2/32-bit/threads-posix/sjlj/x32-4.7.2-release-posix-sjlj-rev8.7z}
     {MinGW-builds GCC 4.7.2 32 bit, rev 8} and later should be able
-    to build Qt including Qt WebKit.
+    to build Qt.
 
     For more information about the MinGW builds, visit the
     \e{Reference Configuration} section of the
@@ -956,10 +939,6 @@
     be located within a specific subdirectory (such as \c printsupport,
     \c imageformats or \c sqldrivers) within your distribution directory.
 
-    \note If you are deploying an application that uses Qt WebKit to display
-    HTML pages from the World Wide Web, you should include all text codec
-    plugins to support as many HTML encodings possible.
-
     The search path for Qt plugins is hard-coded into the QtCore library.
     By default, the plugins subdirectory of the Qt installation is the first
     plugin search path. However, pre-determined paths like the default one
@@ -1044,8 +1023,6 @@ Options:
   --no-system-d3d-compiler   Skip deployment of the system D3D compiler.
   --compiler-runtime         Deploy compiler runtime (Desktop only).
   --no-compiler-runtime      Do not deploy compiler runtime (Desktop only).
-  --webkit2                  Deployment of WebKit2 (web process).
-  --no-webkit2               Skip deployment of WebKit2.
   --json                     Print to stdout in JSON format.
   --angle                    Force deployment of ANGLE.
   --no-angle                 Disable deployment of ANGLE.
@@ -1066,7 +1043,7 @@ the name prepended by --no- (--no-xml). Available libraries:
 bluetooth clucene concurrent core declarative designer designercomponents
 enginio gui qthelp multimedia multimediawidgets multimediaquick network nfc
 opengl positioning printsupport qml qmltooling quick quickparticles quickwidgets
-script scripttools sensors serialport sql svg test webkit webkitwidgets
+script scripttools sensors serialport sql svg test
 websockets widgets winextras xml xmlpatterns webenginecore webengine
 webenginewidgets 3dcore 3drenderer 3dquick 3dquickrenderer 3dinput geoservices
 webchannel
diff --git a/doc/src/portingcppapps_toqt5.qdoc b/doc/src/portingcppapps_toqt5.qdoc
index 9217217e..e1b5dbe6 100644
--- a/doc/src/portingcppapps_toqt5.qdoc
+++ b/doc/src/portingcppapps_toqt5.qdoc
@@ -29,7 +29,7 @@
 \title Porting C++ Applications to Qt 5
 \brief Provides instructions to migrate a Qt 4 C++ application to Qt 5.
 
-This topic talks about the Qt Widgets and Qt WebKit changes in Qt 5. The
+This topic talks about the Qt Widgets changes in Qt 5. The
 following step-by-step instructions take you through the changes required to
 port the \l{Animated Tiles Example}{Animated Tiles} application to Qt 5:
 
@@ -49,31 +49,11 @@ Once you see the application running, check whether it behaves as expected.
 
 \image animatedtiles_snapshot.png "A snapshot of the \c animatedtiles application running on Ubuntu v12.04"
 
-A similar change is needed to port Qt 4 C++ applications using Qt WebKit. The following
-step-by-step instructions take you through the changes required to achieve this:
+It is also possible to keep the project compiling with Qt 4 and Qt 5. This requires:
 
 \list 1
-   \li Open your project using Qt Creator.
-   \li Replace all \c {#include <QtWebKit>} instances with
-       \c {#include <QtWebKitWidgets>} in your project source.
-   \li Edit the \c{.pro} file and add \c {QT += webkitwidgets}.
-
-       \note If the \c {QT +=} statement already exists, append \c webkitwidgets
-       to it.
-   \li Save changes and run your application.
-\endlist
-
-For larger projects, we recommend initially enabling deprecated API by adding the define
-\code
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
-\endcode
-to the \c{.pro} file. In a second step, the define can be removed.
-
-It is possible to keep the project compiling with Qt 4 and Qt 5. This requires:
-
-\list 1
-   \li Omitting the module name from all includes. This is done by passing
-       the command line option \c --strip-modules to \c fixqt4headers.pl.
+   \li Omitting the module name from all includes by running the
+       \c fixqt4headers.pl script with the \c --strip-modules option.
    \li Adding scopes depending on the version of Qt to the \c{.pro} files:
        \code
        greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@@ -88,6 +68,10 @@ It is possible to keep the project compiling with Qt 4 and Qt 5. This requires:
        \endcode
 \endlist
 
+if you are using Qt WebKit, see
+\l{Porting from Qt WebKit to Qt WebEngine}{Qt WebKit to Qt WebEngine} porting
+instructions.
+
 \section1 Related Topics
 \list
 \li \l {C++ API Changes}
diff --git a/doc/src/portingguide.qdoc b/doc/src/portingguide.qdoc
index 1f8057c0..7ffdd165 100644
--- a/doc/src/portingguide.qdoc
+++ b/doc/src/portingguide.qdoc
@@ -56,8 +56,7 @@ The following list summarizes the changes in Qt 5:
        Quick (2.0) from now on to avoid binary breaks in the future.
    \li Qt3Support - This module is removed in Qt 5, so you must move away from
        this module before porting your codebase to Qt 5.
-   \li Qt WebKit - This module has been split into two, there is now a \l{Qt WebKit}
-       and a \l{Qt WebKit Widgets} module.
+   \li Qt WebKit - This module has been replaced with \l{Qt WebEngine}.
    \li Multimedia - In Qt 5, multimedia support is provided by the \l{Qt Multimedia}
        module. Phonon framework is no longer part of Qt, but it continues to be
        maintained by the Phonon developers and has support for Qt 5. See
diff --git a/doc/src/qmlapp/applicationdevelopers.qdoc b/doc/src/qmlapp/applicationdevelopers.qdoc
index 34931a5c..99fa1b7d 100644
--- a/doc/src/qmlapp/applicationdevelopers.qdoc
+++ b/doc/src/qmlapp/applicationdevelopers.qdoc
@@ -117,9 +117,11 @@ Their respective pages contain more information about specific uses.
 
 \section2 Viewing Web Content in QML Applications
 
-The QML type, \l{WebView}, renders and displays dynamic web content. It can load
-a URL or an HTML string. To read more about WebView and view code samples, visit
-the \l{Qt WebKit} page.
+The QML types, \l WebEngineView and \l WebView, render and display dynamic
+web content. The only difference between the two is that the later uses a
+native web view if available. Both these types can load a URL or an HTML
+string. To read more about them and view code
+samples, see \l{Qt WebEngine} and \l{Qt WebView}.
 
 \section2 Sensors, Gestures, and Touch Interfaces
 
diff --git a/doc/src/qmlapp/usecases/text.qdoc b/doc/src/qmlapp/usecases/text.qdoc
index 76fc5cd8..181043d0 100644
--- a/doc/src/qmlapp/usecases/text.qdoc
+++ b/doc/src/qmlapp/usecases/text.qdoc
@@ -29,7 +29,7 @@
 \title Use Case - Displaying Text In QML
 \brief Example of how to display text in QML
 To display text the Text type is provided by the \l {Qt Quick} module. For related uses, the \l{TextInput} and
-\l{TextEdit} types provide editable text controls. For full HTML markup, see the \l {Qt WebKit} module.
+\l{TextEdit} types provide editable text controls. For full HTML markup, see the \l {Qt WebEngine} module.
 
 \section1 Displaying and Formatting Text
 
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index be617743..b332102d 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -92,13 +92,6 @@
         \li \l[QtTestLib]{Qt Test}
         \li Classes for unit testing Qt applications and libraries.
     \row
-        \li \l[QtWebKit]{Qt WebKit} (Deprecated)
-        \li Classes for a WebKit2 based implementation and a QML API.
-            Deprecated in favor of \l[QtWebEngine]{Qt WebEngine}.
-    \row
-        \li \l[QtWebKit]{Qt WebKit Widgets} (Deprecated)
-        \li WebKit1 and QWidget-based classes from Qt 4.
-    \row
         \li \l[QtWidgets]{Qt Widgets}
         \li Classes to extend Qt GUI with C++ widgets.
     \endtable
diff --git a/doc/src/userinterfaces.qdoc b/doc/src/userinterfaces.qdoc
index 228eba8a..68ca2a79 100644
--- a/doc/src/userinterfaces.qdoc
+++ b/doc/src/userinterfaces.qdoc
@@ -34,11 +34,10 @@ Qt features multiple technologies for creating user interfaces. While it is
 possible to mix and match these different technologies as needed, one approach
 is often better suitable for a certain type of user interface than the others.
 \l {Qt Creator Manual}{Qt Creator} is a good example of an application that mixes different user
-interface technologies. In fact, it uses all of the three different approaches
+interface technologies. In fact, it uses the two different approaches
 described below. \l {Qt Creator Manual}{Qt Creator} uses the traditional \l {Qt Widgets} such as
 menus and dialogs as a basis of the user interface, \l {Qt Quick} amongst others
-for the welcome screen, and \l {Qt WebKit} for presenting the Qt reference
-documentation. The following sections provide brief introductions to the
+for the welcome screen. The following sections provide brief introductions to the
 available technologies for creating user interfaces, and a comparison table
 to help choosing the best suitable technology.
 
@@ -113,9 +112,10 @@ data visualization using 2D and 3D models a reality.
 
 \section1 Displaying Web Content
 
-Qt provides both \l{http://www.webkit.org/}{WebKit}-based and Chromium-based
-(\l{Qt WebEngine}{WebEngine}) layout engines, which enable you to embed web content
-into the Qt application. These engines provide both QML and C++ alternatives.
+Qt provides the Chromium-based
+\l{Qt WebEngine}{WebEngine} layout engine, which enable you to embed web content
+into the Qt application. The engine can be integrated into both Qt Widget-based
+and Qt Quick-based applications.
 
 For more information about support for web content in Qt, see
 \l{Integrating Web Content}.
@@ -123,10 +123,10 @@ For more information about support for web content in Qt, see
 \section1 Comparison
 
 Notice that choosing the appropriate technology for building an user interface
-is not always black and white, but may depend on several criterias, such as other
+is not always black and white. It depends on several criteria, such as other
 existing technologies used in a project or even target platform constraints. To
 some extent, many items in the following table can be implemented using any of
-the three available technologies. The following table merely aims to help you
+the three available technologies. The following table aims to help you
 choose the best suited tool for the job.
 
 \table
@@ -134,7 +134,7 @@ choose the best suited tool for the job.
         \li
         \li Qt Quick / Qt Quick Controls
         \li Qt Widgets
-        \li Qt WebKit
+        \li Qt WebEngine
         \li Comments
     \row
         \li Used language(s)
@@ -161,16 +161,15 @@ choose the best suited tool for the job.
         \li Fluid animated UIs
         \li X
         \li
-        \li
-        \li Qt Widgets do not scale well for animations, and Qt WebKit's CSS3
-            animations are not as powerful as Qt Quick animations. Qt Quick
+        \li X
+        \li Qt Widgets do not scale well for animations. Qt Quick
             offers a convenient and natural way to implement animations in a
             declarative manner.
     \row
         \li Touch screen
         \li X
         \li
-        \li
+        \li X
         \li Qt Widgets often require a mouse cursor for good interaction, whereas
             Qt Quick only provides primitive building blocks that were designed
             with touch interaction in mind.
@@ -183,16 +182,16 @@ choose the best suited tool for the job.
         \li
         \li Qt Widgets provide all the bells and whistles, developed over two
             decades, needed for building standard industry type applications.
-            Qt WebKit Widgets provide widgets and additional classes to render
+            Qt WebEngine Widgets provide widgets and additional classes to render
             and interact with web content.
     \row
         \li Model/View programming
         \li (X)
         \li X
         \li
-        \li Some MVC like concepts exist in Qt WebKit, Qt Quick provides convenient
-            views, but Qt Widgets provide more convenient and complete frameworks.
-            In addition to Qt Quick views, Qt Quick Controls provide a TableView.
+        \li Qt Quick provides convenient views, but Qt Widgets provide more
+            convenient and complete framework. In addition to Qt Quick views,
+            Qt Quick Controls provide a TableView.
     \row
         \li Rapid UI development
         \li X
@@ -204,9 +203,9 @@ choose the best suited tool for the job.
         \li HW accelerated graphics
         \li X
         \li
-        \li
+        \li X
         \li Qt Widgets provide QGLWidget for rendering OpenGL graphics,
-            and Qt WebKit supports WebGL, but the OpenGL ES 2.0 or OpenGL 2.0
+            and Qt WebEngine supports WebGL, but the OpenGL ES 2.0 or OpenGL 2.0
             based \l {Qt Quick Scene Graph} has proven to provide the best
             performance for UIs and for integrating with OpenGL content.
     \row
@@ -215,8 +214,7 @@ choose the best suited tool for the job.
         \li
         \li
         \li The particle system and shader effects available in Qt Quick
-            are more flexible compared to CSS Effects and Shaders available
-            in Qt WebKit. Qt Widgets offer very little in this area.
+            are more flexible. Qt Widgets offer very little in this area.
     \row
         \li Rich text processing
         \li X
@@ -231,8 +229,8 @@ choose the best suited tool for the job.
         \li
         \li
         \li X
-        \li Both Qt Quick and Qt Widgets prodive components for presenting
-            \l {richtext-html-subset.html}{simple rich text}, but Qt WebKit
+        \li Both Qt Quick and Qt Widgets provide components for presenting
+            \l {richtext-html-subset.html}{simple rich text}, but Qt WebEngine
             is the right choice for presenting full-blown web content.
 
 \endtable
diff --git a/doc/src/web-content.qdoc b/doc/src/web-content.qdoc
index 8ccb61b6..94f8b3a9 100644
--- a/doc/src/web-content.qdoc
+++ b/doc/src/web-content.qdoc
@@ -28,57 +28,31 @@
 /*!
 \page topics-web-content.html
 \title Integrating Web Content
-\brief Qt's WebKit integration
+\brief Qt enables web content integration.
 
-To create Qt-based web applications, Qt provides both
-\l {http://www.webkit.org/}{WebKit}-based and Chromium-based
-(\l{Qt WebEngine}{WebEngine}) layout engines with support for a wide range of
-standard web techologies such as HTML, CSS, and JavaScript, that make it possible
-to embed content from the World Wide Web into your Qt application.
+To create Qt-based web applications, Qt provides interfaces that support a wide
+range of standard web techologies such as HTML, CSS, and JavaScript. These
+interfaces enable applications to embed content from the World Wide Web.
 
 It is also possible to combine Qt C++ and QML code with HTML and JavaScript to
-create web applications. Through Qt WebChannel, several of Qt's APIs are
+create web applications. Through \l{Qt WebChannel}, several of Qt's APIs are
 accessible to remote clients.
 
-\section1 WebKit in Qt
-
-\l{Qt WebKit} allows WebKit 2 functionality in QML applications by
-importing the \l{WebView} QML type. \l WebView has a minimalistic QML API for
-web content visualization. While it is not as feature-rich as the C++ API of the
-widget classes, it has multi-touch support and employs a multi-process
-architecture to render web content in a separate helper process (QtWebProcess).
-WebView makes it possible to interact with content using touch gestures such as
-panning with inertia (flick), pinch-zoom, tap and double- tap-to-zoom. The
-underlying split-process model (\l
-{http://trac.webkit.org/wiki/WebKit2}{WebKit2}) assures smooth animations in the
-embedding application (UI process) as well as increases stability.
-
-These pages have more information about QML:
-\list
-\li \l{Qt WebKit Examples}
-\li \l{QML Applications}
-\endlist
-
-\section2 WebKit Widgets
-
-The \l{Qt WebKit Widgets} module provides a feature-rich C++ API that
-facilitates loading, viewing, and editing web documents. Qt WebKit Widgets
-provides facilities for rendering of HyperText Markup Language (HTML),
-Extensible HyperText Markup Language (XHTML) and Scalable Vector Graphics (SVG)
-documents, styled using Cascading Style Sheets (CSS) and scripted with
-JavaScript.
-
 \section1 WebEngine in Qt
 
-As with Qt WebKit, \l{Qt WebEngine} allows web content to be displayed in
-Qt applications. This module is new in Qt 5.4 and in future releases will serve
-as a replacement to Qt WebKit.
+Qt provides the Chromium-based Qt WebEngine module for applications
+targeting desktop and embedded platforms. For example, a web browser
+application for Linux platform.
+
+It also provides the Qt WebView module, which uses the native web engine
+of the platform. For example, a RSS feed reader Qt Quick application for
+Android and iOS.
 
 These pages contain information about porting applications to use Qt WebEngine
 and the various APIs:
 \list
-\li \l{Qt WebEngine} - provides a QML API
-\li \l{Qt WebEngine Widgets} - provides a C++ API
+\li \l{Qt WebEngine Overview}
+\li \l{Qt WebView}
 \li \l{Porting from Qt WebKit to Qt WebEngine}
 \endlist