diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-25 10:58:41 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-25 11:14:15 +0000 |
| commit | bd7df60ac506226ab9f4eb6be3dcebf14253244a (patch) | |
| tree | ae6e25b5cf610793de06bee7abc204b599d5c765 | |
| parent | ae346195efaca5d01b67c5df1209512c7edaddb0 (diff) | |
Move documentation for Instantiator and Package into QtQml.Models
Change-Id: Ie086399104de51ce0ae741f6fef316633ed47aa9
Reviewed-by: Martin Smith <martin.smith@qt.io>
| -rw-r--r-- | src/qmlmodels/qqmlinstantiator.cpp | 5 | ||||
| -rw-r--r-- | src/qmlmodels/qquickpackage.cpp | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/qmlmodels/qqmlinstantiator.cpp b/src/qmlmodels/qqmlinstantiator.cpp index af1b526e1d..f9d5762f6e 100644 --- a/src/qmlmodels/qqmlinstantiator.cpp +++ b/src/qmlmodels/qqmlinstantiator.cpp @@ -220,7 +220,8 @@ void QQmlInstantiatorPrivate::makeModel() /*! \qmltype Instantiator \instantiates QQmlInstantiator - \inqmlmodule QtQml + \inqmlmodule QtQml.Models + \ingroup qtquick-models \brief Dynamically creates objects. A Instantiator can be used to control the dynamic creation of objects, or to dynamically @@ -231,6 +232,8 @@ void QQmlInstantiatorPrivate::makeModel() can also be destroyed dynamically through other means, and the Instantiator will not recreate them unless the properties of the Instantiator change. + \note Instantiator is part of QtQml.Models since version 2.14 and part of QtQml since + version 2.1. Importing Instantiator via QtQml is deprecated since Qt 5.14. */ QQmlInstantiator::QQmlInstantiator(QObject *parent) : QObject(*(new QQmlInstantiatorPrivate), parent) diff --git a/src/qmlmodels/qquickpackage.cpp b/src/qmlmodels/qquickpackage.cpp index 03539d8737..567381e5ab 100644 --- a/src/qmlmodels/qquickpackage.cpp +++ b/src/qmlmodels/qquickpackage.cpp @@ -47,8 +47,8 @@ QT_BEGIN_NAMESPACE /*! \qmltype Package \instantiates QQuickPackage - \inqmlmodule QtQuick - \ingroup qtquick-views + \inqmlmodule QtQml.Models + \ingroup qtquick-models \brief Specifies a collection of named items. The Package type is used in conjunction with @@ -71,6 +71,9 @@ QT_BEGIN_NAMESPACE \snippet package/view.qml 0 + \note Package is part of QtQml.Models since version 2.14 and part of QtQuick since version 2.0. + Importing Package via QtQuick is deprecated since Qt 5.14. + \sa {Qt Quick Examples - Views}, {Qt Quick Demo - Photo Viewer}, {Qt QML} */ |