diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-25 09:53:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 12:15:55 +0200 |
| commit | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (patch) | |
| tree | 18e22092c2764fea16442fd814f230d4fe095a49 /src/qml/types/qqmldelegatemodel.cpp | |
| parent | c21a6a9f2c2d635aca3bf88a6431c560b16b1cc6 (diff) | |
| parent | 9999591e69a0908cd3fbe14646fb98881e32061b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/quick/handlers/qquickhandlerpoint.cpp
src/quick/handlers/qquicksinglepointhandler.cpp
tests/auto/qml/ecmascripttests/test262
Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
Diffstat (limited to 'src/qml/types/qqmldelegatemodel.cpp')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index 33fe5f3438..62ccf0d66c 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -164,7 +164,7 @@ QQmlDelegateModelParts::QQmlDelegateModelParts(QQmlDelegateModel *parent) \instantiates QQmlDelegateModel \inqmlmodule QtQuick \ingroup qtquick-models - \brief Encapsulates a model and delegate + \brief Encapsulates a model and delegate. The VisualDataModel type encapsulates a model and the delegate that will be instantiated for items in a model. @@ -179,7 +179,7 @@ QQmlDelegateModelParts::QQmlDelegateModelParts(QQmlDelegateModel *parent) \qmltype DelegateModel \instantiates QQmlDelegateModel \inqmlmodule QtQml.Models - \brief Encapsulates a model and delegate + \brief Encapsulates a model and delegate. The DelegateModel type encapsulates a model and the delegate that will be instantiated for items in the model. @@ -2369,7 +2369,7 @@ void QQmlDelegateModelGroupPrivate::destroyingPackage(QQuickPackage *package) \instantiates QQmlDelegateModelGroup \inqmlmodule QtQuick \ingroup qtquick-models - \brief Encapsulates a filtered set of visual data items + \brief Encapsulates a filtered set of visual data items. The VisualDataGroup type provides a means to address the model data of a model's delegate items, as well as sort and filter these delegate items. @@ -2385,7 +2385,7 @@ void QQmlDelegateModelGroupPrivate::destroyingPackage(QQuickPackage *package) \instantiates QQmlDelegateModelGroup \inqmlmodule QtQml.Models \ingroup qtquick-models - \brief Encapsulates a filtered set of visual data items + \brief Encapsulates a filtered set of visual data items. The DelegateModelGroup type provides a means to address the model data of a DelegateModel's delegate items, as well as sort and filter these delegate |