diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2013-09-24 16:58:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-27 12:31:01 +0200 |
| commit | 1ef957834bf9040ccd001fa6d80e483b9b21452c (patch) | |
| tree | 7a3d8b4f14c071152e818089c4c7cf127ec61e5e /src/qml/types | |
| parent | 6ce4772473fd3695e8320c06e90061d58233d52c (diff) | |
Doc: Updated imports, \qmlmodule, and \inqmlmodule versions in src/qml.
-QDoc ignores the version in \inqmlmodule so its better to remove them
to avoid confusion.
-Qt QML import version is 2.2 for 5.2 release
-Qt Quick import version is 2.2 for 5.2 release
Task-number: QTBUG-32172
Change-Id: I15df270f1fb4df0476a9ddd854fb9ddf58e9fc7c
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmlbind.cpp | 2 | ||||
| -rw-r--r-- | src/qml/types/qqmlconnections.cpp | 2 | ||||
| -rw-r--r-- | src/qml/types/qqmlinstantiator.cpp | 2 | ||||
| -rw-r--r-- | src/qml/types/qqmltimer.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp index 129a81ee50..e3a3d55e18 100644 --- a/src/qml/types/qqmlbind.cpp +++ b/src/qml/types/qqmlbind.cpp @@ -76,7 +76,7 @@ public: /*! \qmltype Binding \instantiates QQmlBind - \inqmlmodule QtQml 2 + \inqmlmodule QtQml \ingroup qtquick-interceptors \brief Enables the arbitrary creation of property bindings diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp index 725c169529..57c3a6f987 100644 --- a/src/qml/types/qqmlconnections.cpp +++ b/src/qml/types/qqmlconnections.cpp @@ -73,7 +73,7 @@ public: /*! \qmltype Connections \instantiates QQmlConnections - \inqmlmodule QtQml 2 + \inqmlmodule QtQml \ingroup qtquick-interceptors \brief Describes generalized connections to signals diff --git a/src/qml/types/qqmlinstantiator.cpp b/src/qml/types/qqmlinstantiator.cpp index 234494e088..4173813154 100644 --- a/src/qml/types/qqmlinstantiator.cpp +++ b/src/qml/types/qqmlinstantiator.cpp @@ -190,7 +190,7 @@ void QQmlInstantiatorPrivate::makeModel() /*! \qmltype Instantiator \instantiates QQmlInstantiator - \inqmlmodule QtQml 2 + \inqmlmodule QtQml \brief Dynamically creates objects A Instantiator can be used to control the dynamic creation of objects, or to dynamically diff --git a/src/qml/types/qqmltimer.cpp b/src/qml/types/qqmltimer.cpp index a1cb8532f7..71cce6051f 100644 --- a/src/qml/types/qqmltimer.cpp +++ b/src/qml/types/qqmltimer.cpp @@ -75,7 +75,7 @@ public: /*! \qmltype Timer \instantiates QQmlTimer - \inqmlmodule QtQml 2 + \inqmlmodule QtQml \ingroup qtquick-interceptors \brief Triggers a handler at a specified interval |