diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-03-02 13:49:11 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-03-02 13:49:11 +0100 |
commit | 32c1212f81fcfc7b5e49f85d68b05cd94cd90521 (patch) | |
tree | 795a3175173285f4ba5bd15cdc7ae6ec11c556d2 /src/qml/types/qqmlobjectmodel.cpp | |
parent | 79d3fe1bba4589c7f5780bb505eac7872061ee32 (diff) | |
parent | 78dd18a0cd18449e1289e428ea6eca65e28fb114 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: I7e43a0a47d49de38617f6afc7548f9a9e212a851
Diffstat (limited to 'src/qml/types/qqmlobjectmodel.cpp')
-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). |