aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlan Alpert <aalpert@rim.com>2013-01-16 10:13:00 -0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-06 18:44:16 +0100
commitb2e916eb871f6dd91ac3f2c69e856107edb1efd5 (patch)
treed7ca24b45768bd4bef1c4eb8c32a8c15ef511d9a /src
parent2150eaa2c49fa5f996aa69980945522cf0a0f281 (diff)
Add \qmlmodule commands for QtQml and QtQuick
Change-Id: I07a961bb2c5e39bfef134264e5f24974e1501361 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/qml/doc/src/qmltypereference.qdoc8
-rw-r--r--src/quick/doc/src/qmltypereference.qdoc13
2 files changed, 17 insertions, 4 deletions
diff --git a/src/qml/doc/src/qmltypereference.qdoc b/src/qml/doc/src/qmltypereference.qdoc
index 203bdd3eb9..cce8d108d8 100644
--- a/src/qml/doc/src/qmltypereference.qdoc
+++ b/src/qml/doc/src/qmltypereference.qdoc
@@ -25,9 +25,10 @@
**
****************************************************************************/
/*!
-\page qtqml-typereference-topic.html
-\title QML Types Provided By The QtQml Module
-\brief List of QML types provided by the QtQml module
+\qmlmodule QtQml 2
+\title Qt Qml QML Types
+\ingroup qmlmodules
+\brief List of QML types provided by the Qt QML module
The \c QtQml module provides the definition and implementation of various
convenience types which can be used with the QML language, including some
@@ -153,7 +154,6 @@ run-time:
}
}
\endcode
-
*/
/*!
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index 9604b927a8..a627cfe7b5 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -285,6 +285,19 @@ Data Storage
*/
/*!
+\qmlmodule QtQuick 2
+\brief The QtQuick 2 module provides graphical primitives for use in QML.
+
+The QtQuick 2 module provides graphical primitive types. They can be used with the following import
+\code
+import QtQuick 2.1
+\endcode
+
+For a more detailed listing of types in the QtQuick 2 import, see the \l{qtquick-qmltypereference.html}{QtQuick 2 type reference page}.
+For more details about the QtQuick 2 module, see the \l{QtQuick} module page.
+*/
+
+/*!
\qmlbasictype color
\ingroup qtquickbasictypes
\brief an ARGB color value.