diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-21 15:18:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-21 15:18:07 +0200 |
| commit | 4a1846acd122af58c601f9832ade4c4d8986e66a (patch) | |
| tree | 019b131bf411ba3c7e62fcff0199bdf073825fa2 /src/qml/types/qqmlobjectmodel.cpp | |
| parent | 3c63ac03ed262b59962b45ac974b82edc7c83880 (diff) | |
| parent | 27bee8076f50a948ffb9997e2a0673854681437d (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
tools/qml/main.cpp
Change-Id: I6d521b21be85d91ebb96c28e2c64186f02d94842
Diffstat (limited to 'src/qml/types/qqmlobjectmodel.cpp')
| -rw-r--r-- | src/qml/types/qqmlobjectmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp index 0076c26950..4b64f24806 100644 --- a/src/qml/types/qqmlobjectmodel.cpp +++ b/src/qml/types/qqmlobjectmodel.cpp @@ -210,7 +210,7 @@ public: \inqmlmodule QtQuick \brief Defines a set of objects to be used as a model - The VisualItemModel type encapsulates contains the objects to be used + The VisualItemModel type contains the objects to be used as a model. This element is now primarily available as ObjectModel in the QtQml.Models module. |