diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:01:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:01:21 +0200 |
| commit | c80eb38354854f2ccc7ea070a9857409acc36792 (patch) | |
| tree | 806cb68b337ac7c8ab8f9a48538e6e0211f57ed8 /src/qmlmodels/qqmlobjectmodel.cpp | |
| parent | d38bac596946c3dd9cce3c0b4127509421dc917d (diff) | |
| parent | f19ec4561b4975d68290593b599d3c38d0f9f6d3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/qml/jsruntime/qv4engine.cpp
src/quick/handlers/qquicktaphandler.cpp
src/quick/items/qquicktableview.cpp
Done-With: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Done-With: Ulf Hermann <ulf.hermann@qt.io>
Done-With: Shawn Rutledge <shawn.rutledge@qt.io>
Change-Id: If9558a33f01693ce96420c094e0b57dfff0626cd
Diffstat (limited to 'src/qmlmodels/qqmlobjectmodel.cpp')
| -rw-r--r-- | src/qmlmodels/qqmlobjectmodel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qmlmodels/qqmlobjectmodel.cpp b/src/qmlmodels/qqmlobjectmodel.cpp index b6330b4295..7409178616 100644 --- a/src/qmlmodels/qqmlobjectmodel.cpp +++ b/src/qmlmodels/qqmlobjectmodel.cpp @@ -328,7 +328,7 @@ QObject *QQmlObjectModel::get(int index) const \qmlmethod QtQml.Models::ObjectModel::append(object item) \since 5.6 - Appends a new item to the end of the model. + Appends a new \a item to the end of the model. \code objectModel.append(objectComponent.createObject()) @@ -346,7 +346,7 @@ void QQmlObjectModel::append(QObject *object) \qmlmethod QtQml.Models::ObjectModel::insert(int index, object item) \since 5.6 - Inserts a new item to the model at position \a index. + Inserts a new \a item to the model at position \a index. \code objectModel.insert(2, objectComponent.createObject()) @@ -371,7 +371,7 @@ void QQmlObjectModel::insert(int index, QObject *object) \qmlmethod QtQml.Models::ObjectModel::move(int from, int to, int n = 1) \since 5.6 - Moves \a n items \a from one position \a to another. + Moves \e n items \a from one position \a to another. The from and to ranges must exist; for example, to move the first 3 items to the end of the model: @@ -398,7 +398,7 @@ void QQmlObjectModel::move(int from, int to, int n) \qmlmethod QtQml.Models::ObjectModel::remove(int index, int n = 1) \since 5.6 - Removes the items at \a index from the model. + Removes \e n items at \a index from the model. \sa clear() */ |