diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2013-04-09 12:08:44 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-17 19:02:21 +0200 |
| commit | 3d3c020621a81d7eff08d2b538d1647b7b3b1618 (patch) | |
| tree | 4460485919c40e362ff1dfd9e4f100b3db66b95a /src/qml/doc/src | |
| parent | 99da7a805240f64f550572bb6f970b9e68b043c9 (diff) | |
Doc: Reassigned types and pages to their correct modules.
1)Moved classes and basic types to \module QtQml 2.
-QQml* classes are in QtQml 2 for 5.1
2)Removed \inqmlmodule commands in overviews and tutorials.
-Only QML API should have \inqmlmodule commands because they are added
to the auto generated list of types.
Change-Id: I9aa3ca8062fa9fed76734885829879122841b119
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/qml/doc/src')
| -rw-r--r-- | src/qml/doc/src/javascript/date.qdoc | 3 | ||||
| -rw-r--r-- | src/qml/doc/src/javascript/number.qdoc | 3 | ||||
| -rw-r--r-- | src/qml/doc/src/javascript/string.qdoc | 3 | ||||
| -rw-r--r-- | src/qml/doc/src/whatsnew.qdoc | 1 |
4 files changed, 3 insertions, 7 deletions
diff --git a/src/qml/doc/src/javascript/date.qdoc b/src/qml/doc/src/javascript/date.qdoc index 9f696930d2..7da24d4092 100644 --- a/src/qml/doc/src/javascript/date.qdoc +++ b/src/qml/doc/src/javascript/date.qdoc @@ -27,7 +27,7 @@ /*! \qmltype Date - \inqmlmodule QtQuick 2 + \inqmlmodule QtQml 2 \brief Provides date functions The QML Date object extends the JS Date object with @@ -223,4 +223,3 @@ } \endcode */ - diff --git a/src/qml/doc/src/javascript/number.qdoc b/src/qml/doc/src/javascript/number.qdoc index 1e7894f3d1..20fe40c86f 100644 --- a/src/qml/doc/src/javascript/number.qdoc +++ b/src/qml/doc/src/javascript/number.qdoc @@ -27,7 +27,7 @@ /*! \qmltype Number - \inqmlmodule QtQuick 2 + \inqmlmodule QtQml 2 \brief The Number object provides represents a number value The QML Number object extends the JS Number object with @@ -102,4 +102,3 @@ d = Number.fromLocaleString(german, "1.234") // d == 1234.0 \endcode */ - diff --git a/src/qml/doc/src/javascript/string.qdoc b/src/qml/doc/src/javascript/string.qdoc index cc3004d93f..ab7d7a4ebe 100644 --- a/src/qml/doc/src/javascript/string.qdoc +++ b/src/qml/doc/src/javascript/string.qdoc @@ -27,7 +27,7 @@ /*! \qmltype String - \inqmlmodule QtQuick 2 + \inqmlmodule QtQml 2 \brief The String object represents a string value The QML String object extends the JS String object with @@ -48,4 +48,3 @@ console.log(message.arg(count)) \endcode */ - diff --git a/src/qml/doc/src/whatsnew.qdoc b/src/qml/doc/src/whatsnew.qdoc index 361f6e61ee..d7a1db9567 100644 --- a/src/qml/doc/src/whatsnew.qdoc +++ b/src/qml/doc/src/whatsnew.qdoc @@ -28,7 +28,6 @@ /*! \title Qt QML Release Notes \page qtqml-releasenotes.html -\inqmlmodule QtQuick 2.0 \section1 Qt QML in Qt 5 |