Doc: Update Qt Modules page and related information

    - Mark Qt WebKit, Qt Script, Qt Declarative as deprecated
    - Add Qt Quick Extras, remove Qt Quick Enterprise Controls
    - Graduate Qt Canvas 3D from technology preview to an Add-on module
    - Add Qt3D as a Technology Preview module
    - Add Qt Quick Widgets (was missing previously)

Task-number: QTBUG-44680
Change-Id: I91c70c533f70a4478adc5e488af469864611d7c8
Reviewed-by: Martin Smith <martin.smith@digia.com>

5 files changed, 33 insertions, 17 deletions

diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf
index 1d1f1bb3..4693fb1c 100644
--- a/doc/config/qtdoc.qdocconf
+++ b/doc/config/qtdoc.qdocconf
@@ -38,6 +38,7 @@ depends += \
     qtquick \
     qtquickcontrols \
     qtquickdialogs \
+    qtquickextras \
     qtquicklayouts \
     qtscript \
     qtscripttools \
@@ -58,7 +59,9 @@ depends += \
     qtwebkitexamples \
     qtx11extras \
     qtxml \
-    qtxmlpatterns
+    qtxmlpatterns \
+    qt3dcore \
+    qt3drender
 
 headerdirs  += ../src
 imagedirs   += ../src/images \
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 7a7256a7..961d251f 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -234,11 +234,6 @@
 */
 
 /*!
-    \externalpage http://doc.qt.io/QtQuickEnterpriseControls
-    \title Qt Quick Enterprise Controls
-*/
-
-/*!
     \externalpage http://doc.qt.io/QtVirtualKeyboard
     \title Qt Virtual Keyboard
 */
diff --git a/doc/src/graphics.qdoc b/doc/src/graphics.qdoc
index 4a193b9e..ce958b90 100644
--- a/doc/src/graphics.qdoc
+++ b/doc/src/graphics.qdoc
@@ -121,6 +121,9 @@ OpenGL into their applications.
     \li \l {http://www.khronos.org/opengl}{www.khronos.org/opengl} -
     The official OpenGL pages.
 
+    \li \l[QtCanvas3D]{Qt Canvas 3D} - An add-on module that provides a way to
+        make OpenGL-like 3D drawing calls from Qt Quick using JavaScript.
+
 \endlist
 
 Prior to Qt 5.0, OpenGL support in Qt was handled by the \l {Qt OpenGL}
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 8055ff22..513e6fbf 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -92,11 +92,11 @@
         \li \l[QtTestLib]{Qt Test}
         \li Classes for unit testing Qt applications and libraries.
     \row
-        \li \l[QtWebKit]{Qt WebKit}
-        \li Classes for a WebKit2 based implementation and a new QML API.
-            See also Qt WebKit Widgets in the add-on modules.
+        \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}
+        \li \l[QtWebKit]{Qt WebKit Widgets} (Deprecated)
         \li WebKit1 and QWidget-based classes from Qt 4.
     \row
         \li \l[QtWidgets]{Qt Widgets}
@@ -157,6 +157,12 @@
         \l{Qt for iOS}{iOS}, \l{Qt for Linux/X11}{Linux} and \l{Qt for OS X}{OS X}
         \li Provides access to Bluetooth hardware.
     \row
+        \li \l[QtCanvas3D]{Qt Canvas 3D}
+        \li All
+        \li
+        \li Enables OpenGL-like 3D drawing calls from Qt Quick applications
+            using JavaScript.
+    \row
         \li \l[QtConcurrent]{Qt Concurrent}
         \li
         \li
@@ -212,14 +218,25 @@
         \li
         \li Classes to make printing easier and more portable.
     \row
-        \li \l{Qt Quick 1 Reference Documentation}{Qt Declarative}
+        \li \l{Qt Quick 1 Reference Documentation}{Qt Declarative} (Deprecated)
         \li All
         \li
         \li Qt Declarative is provided for \l{Qt 4.8 Reference Documentation}{Qt 4}
         compatibility. The documentation is available through the Qt 4.8
         \l{Qt Quick 1 Reference Documentation}{Qt Quick} documentation.
     \row
-        \li \l[QtScript]{Qt Script}
+        \li \l[QtQuickExtras]{Qt Quick Extras}
+        \li All
+        \li
+        \li Provides a specialized set of controls that can be used to build
+            interfaces in Qt Quick.
+    \row
+        \li \l{Qt Quick Widgets C++ Classes}{Qt Quick Widgets}
+        \li All
+        \li
+        \li Provides a C++ widget class for displaying a Qt Quick user interface.
+    \row
+        \li \l[QtScript]{Qt Script} (Deprecated)
         \li All
         \li
         \li Classes for making Qt applications scriptable. Provided for Qt 4.x
@@ -312,8 +329,6 @@
     \row \li \l{Qt Quick Compiler}
          \li Enables compiling .qml source files into application binaries, improving load times
              and security for code assets.
-    \row \li \l{Qt Quick Enterprise Controls}
-         \li A set of advanced UI controls with an industry-specific look-and-feel.
     \row \li \l{Qt Data Visualization}
          \li UI Components for creating stunning 3D data visualizations.
     \row \li \l{Qt Purchasing}
@@ -339,8 +354,9 @@
     \row \li \l{Qt WebView}
          \li Displays web content in a QML application by using APIs native to the platform,
              without the need to include a full web browser stack.
-    \row \li \l{Qt Canvas 3D}
-         \li Enables OpenGL-like 3D drawing calls from Qt Quick applications using JavaScript.
+    \row \li \l[Qt3DCore]{Qt3D Module}{Qt3D}
+         \li Functionality for near-realtime simulation systems with support
+             for 2D and 3D rendering.
     \endtable
 
     \section1 Qt Tools
diff --git a/doc/src/reference.qdoc b/doc/src/reference.qdoc
index d92a0695..f76dbf0c 100644
--- a/doc/src/reference.qdoc
+++ b/doc/src/reference.qdoc
@@ -58,7 +58,6 @@
     \li \l{Qt for Device Creation}
     \li \l{Qt Charts}
     \li \l{Qt Quick Compiler}
-    \li \l{Qt Quick Enterprise Controls}
     \li \l{Qt Data Visualization}
     \li \l{Qt Purchasing}
     \li \l{Qt Virtual Keyboard}