diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:05:12 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:05:12 +0100 |
| commit | 78dd18a0cd18449e1289e428ea6eca65e28fb114 (patch) | |
| tree | bbb442c218d1504adb70d49ae67ac78a9c2c42bd /src/qml/types | |
| parent | 015dff255ff0f40c553b1dee43c6cff013df64eb (diff) | |
| parent | 8c864e52369ee4d55a1d9345215c8153144b5939 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I6cbd83b61fac34c2ba6936711289ec09a490719a
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmlobjectmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp index 21205f4490..d926ecb6ce 100644 --- a/src/qml/types/qqmlobjectmodel.cpp +++ b/src/qml/types/qqmlobjectmodel.cpp @@ -178,8 +178,8 @@ public: \ingroup qtquick-models \brief Defines a set of items to be used as a model - A ObjectModel contains the visual items to be used in a view. - When a ObjectModel is used in a view, the view does not require + An ObjectModel contains the visual items to be used in a view. + When an ObjectModel is used in a view, the view does not require a delegate since the ObjectModel already contains the visual delegate (items). |