Doc: Cleaned up \module and \qmlmodule page for Qt Quick and Qt QML.

-Qt Quick: used a regular page instead of \qmlmodule
-Cleaned up titles and membership

Change-Id: I8ae24fec203ea675d213bd0df6105d0c2abd8164
Reviewed-by: Martin Smith <martin.smith@digia.com>

5 files changed, 8 insertions, 10 deletions

diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
index 3bf8adc7b3..5787977bc4 100644
--- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
+++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
@@ -67,7 +67,7 @@ and \l {qtqml-cppintegration-definetypes.html}{Defining QML Types from C++}.
 \example examples/tutorials/extending/chapter1-basics
 
 A common task when extending QML is to provide a new QML type that supports some
- custom functionality beyond what is provided by the built-in \l {QML Types Provided by Qt Quick}{QtQuick types}.
+ custom functionality beyond what is provided by the built-in \l {Qt Quick QML Types}{QtQuick types}.
 For example, this could be done to implement particular data models, or provide
 elements with custom painting and drawing capabilities, or access system features
 like network programming that are not accessible through built-in QML features.
@@ -479,4 +479,3 @@ Or randomly add and remove slices from time to time using \l{Property Value Sour
 See the \l{Integrating QML and C++} documentation for more information.
 
 */
-
diff --git a/src/qml/doc/src/qtqml-cpp.qdoc b/src/qml/doc/src/qtqml-cpp.qdoc
index 4a7ea0c1bb..5fe9292588 100644
--- a/src/qml/doc/src/qtqml-cpp.qdoc
+++ b/src/qml/doc/src/qtqml-cpp.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 /*!
 \module QtQml
-\title Qt QML Module - C++ Classes
+\title Qt QML Module C++ Classes
 \brief The C++ API provided by the Qt QML module
 
 To include the definitions of the module's classes, use the
@@ -46,5 +46,3 @@ QT += qml
 For more information on the Qt QML module, see the
 \l{Qt QML} module documentation.
 */
-
-
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index e2bb247af8..c0b4968ce3 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -27,7 +27,8 @@
 
 /*!
 \page qtquick-qmltypereference.html
-\title QML Types Provided by Qt Quick
+\title Qt Quick QML Types
+\ingroup qmlmodules
 \brief Description of the QML types provided by the Qt Quick module
 
 The \c QtQuick QML module provides a variety of QML types for creating user
diff --git a/src/quick/doc/src/qtquick-cpp.qdoc b/src/quick/doc/src/qtquick-cpp.qdoc
index 6fc53c9f13..54a37f62b6 100644
--- a/src/quick/doc/src/qtquick-cpp.qdoc
+++ b/src/quick/doc/src/qtquick-cpp.qdoc
@@ -26,7 +26,8 @@
 ****************************************************************************/
 /*!
   \module QtQuick
-  \title Qt Quick Module - C++ Classes
+  \title Qt Quick Module C++ Classes
+  \ingroup modules
 
   \brief The Qt Quick module provides classes for embedding Qt Quick
   in Qt/C++ applications.
diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc
index 5ce289c9e9..1d24e33cc4 100644
--- a/src/quick/doc/src/qtquick.qdoc
+++ b/src/quick/doc/src/qtquick.qdoc
@@ -39,7 +39,7 @@ visual components, receiving user input, creating data models and views
 and delayed object instantiation.
 
 The Qt Quick module provides both the \c QtQuick QML module, which supplies
-\l{QML Types Provided by Qt Quick}{a set of QML types} for creating user
+\l{Qt Quick QML Types}{a set of QML types} for creating user
 interfaces with the QML language, and the \c QtQuick C++ module, which supplies
 \l{Qt Quick Module - C++ Classes}{a set of C++ APIs} for integrating with user interfaces and
 applications built with QML and the \c QtQuick QML module.
@@ -113,7 +113,7 @@ Additional Qt Quick information:
 \list
 \li \l{Qt Quick Module - C++ Classes} - the C++ API provided by the
     Qt Quick module
-\li \l{QML Types Provided by Qt Quick} - a list of QML types provided by the
+\li \l{Qt Quick QML Types} - a list of QML types provided by the
     \c{QtQuick} import
     \list
     \li \l{QML Module QtQuick.XmlListModel 2.0}{XML List Model} - contains types
@@ -137,4 +137,3 @@ Further information for writing QML applications:
     Qt QML module, which provides the QML engine and language infrastructure
 \endlist
 */
-