diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2013-09-24 16:41:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-25 13:51:51 +0200 |
| commit | 0e62896fdcbad014177ba11d88bbe46eb496ab2d (patch) | |
| tree | 97e7cb60ca408a407134eef6e9deb94a060227dd /src/qml | |
| parent | 89042598c4005c82a64e63ea6f628e24dc5ca979 (diff) | |
Doc: Fixed and updated Qt Quick's \qmlmodule page
-incremented version to Qt Quick 2.2 (in \qmlmodule page)
-import changed to QtQuick 2.2
-\inqmlmodule no longer needs the version. QDoc will ignore the version
but it is better to remove it now to avoid confusion
Task-number: QTBUG-32172
Change-Id: I40b52e59667014720be40a35b3a8fb9836825e31
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 4 | ||||
| -rw-r--r-- | src/qml/types/qqmlobjectmodel.cpp | 2 | ||||
| -rw-r--r-- | src/qml/types/qquickpackage.cpp | 2 | ||||
| -rw-r--r-- | src/qml/types/qquickworkerscript.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index 64f4d5c000..0fa0c73ae0 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -139,7 +139,7 @@ QQmlDelegateModelParts::QQmlDelegateModelParts(QQmlDelegateModel *parent) /*! \qmltype VisualDataModel \instantiates QQmlDelegateModel - \inqmlmodule QtQuick 2 + \inqmlmodule QtQuick \ingroup qtquick-models \brief Encapsulates a model and delegate @@ -2196,7 +2196,7 @@ void QQmlDelegateModelGroupPrivate::destroyingPackage(QQuickPackage *package) /*! \qmltype VisualDataGroup \instantiates QQmlDelegateModelGroup - \inqmlmodule QtQuick 2 + \inqmlmodule QtQuick \ingroup qtquick-models \brief Encapsulates a filtered set of visual data items diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp index f2a7477c1b..3cf87bf7a3 100644 --- a/src/qml/types/qqmlobjectmodel.cpp +++ b/src/qml/types/qqmlobjectmodel.cpp @@ -169,7 +169,7 @@ public: /*! \qmltype VisualItemModel \instantiates QQmlObjectModel - \inqmlmodule QtQuick 2 + \inqmlmodule QtQuick \brief Defines a set of objects to be used as a model The VisualItemModel type encapsulates contains the objects to be used diff --git a/src/qml/types/qquickpackage.cpp b/src/qml/types/qquickpackage.cpp index bdb8a4bc15..e013a0dd37 100644 --- a/src/qml/types/qquickpackage.cpp +++ b/src/qml/types/qquickpackage.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype Package \instantiates QQuickPackage - \inqmlmodule QtQuick 2 + \inqmlmodule QtQuick \ingroup qtquick-views \brief Specifies a collection of named items diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index 02fae8c292..ef23a34db8 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -574,7 +574,7 @@ void QQuickWorkerScriptEngine::run() \qmltype WorkerScript \instantiates QQuickWorkerScript \ingroup qtquick-threading - \inqmlmodule QtQuick 2 + \inqmlmodule QtQuick \brief Enables the use of threads in a Qt Quick application Use WorkerScript to run operations in a new thread. |