aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/types/qqmlobjectmodel.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-10-04 10:41:55 +0200
committerLiang Qi <liang.qi@qt.io>2017-10-04 10:41:55 +0200
commit0d3592aa7fab8bf4d8f80bc3b35323efe6950b1b (patch)
tree169707c4318185c418c8705628f03dd4118223e0 /src/qml/types/qqmlobjectmodel.cpp
parentb9e3df1cceb337947c2c701975163b53dbe131d8 (diff)
parent265b3bea18c1ac13da413931024f64f49a2da7fc (diff)
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1
Diffstat (limited to 'src/qml/types/qqmlobjectmodel.cpp')
-rw-r--r--src/qml/types/qqmlobjectmodel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp
index 64d0169f6b..dcd0360199 100644
--- a/src/qml/types/qqmlobjectmodel.cpp
+++ b/src/qml/types/qqmlobjectmodel.cpp
@@ -72,7 +72,7 @@ public:
int ref;
};
- QQmlObjectModelPrivate() : QObjectPrivate() {}
+ QQmlObjectModelPrivate() : QObjectPrivate(), moveId(0) {}
static void children_append(QQmlListProperty<QObject> *prop, QObject *item) {
int index = static_cast<QQmlObjectModelPrivate *>(prop->data)->children.count();
@@ -129,7 +129,7 @@ public:
}
QQmlChangeSet changeSet;
- changeSet.move(from, to, n, 0);
+ changeSet.move(from, to, n, ++moveId);
emit q->modelUpdated(changeSet, false);
emit q->childrenChanged();
}
@@ -166,7 +166,7 @@ public:
return -1;
}
-
+ uint moveId;
QList<Item> children;
};