From b2e916eb871f6dd91ac3f2c69e856107edb1efd5 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Wed, 16 Jan 2013 10:13:00 -0800 Subject: [PATCH] Add \qmlmodule commands for QtQml and QtQuick Change-Id: I07a961bb2c5e39bfef134264e5f24974e1501361 Reviewed-by: Jerome Pasion --- src/qml/doc/src/qmltypereference.qdoc | 8 ++++---- src/quick/doc/src/qmltypereference.qdoc | 13 +++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/qml/doc/src/qmltypereference.qdoc b/src/qml/doc/src/qmltypereference.qdoc index 203bdd3..cce8d10 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 9604b92..a627cfe 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. -- 1.7.2.5