summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-29 07:53:55 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-29 07:53:55 (GMT)
commitffce38caefab278e7088f5156c1be2ae4f402af6 (patch)
treece858463aef92cef84a4ba4bedf4ea6f319a2384 /src/declarative
parente154fb84b075ad3fda4ac02d620b28cc50e46c09 (diff)
parentb64817858484db6e7c280d41ed81d4c87dff2275 (diff)
downloadQt-ffce38caefab278e7088f5156c1be2ae4f402af6.zip
Qt-ffce38caefab278e7088f5156c1be2ae4f402af6.tar.gz
Qt-ffce38caefab278e7088f5156c1be2ae4f402af6.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Fix conversion of QAbstractItemModel::rowsMoved() parameters
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 26757b5..b896a77 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -1375,7 +1375,7 @@ void QDeclarativeVisualDataModel::_q_rowsMoved(const QModelIndex &sourceParent,
Q_D(QDeclarativeVisualDataModel);
const int count = sourceEnd - sourceStart + 1;
if (destinationParent == d->m_root && sourceParent == d->m_root) {
- _q_itemsMoved(sourceStart, sourceStart > destinationRow ? destinationRow : destinationRow-1, count);
+ _q_itemsMoved(sourceStart, sourceStart > destinationRow ? destinationRow : destinationRow-count, count);
} else if (sourceParent == d->m_root) {
_q_itemsRemoved(sourceStart, count);
} else if (destinationParent == d->m_root) {