Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

Conflicts:
	src/declarative/qml/qmlcomponentjs.cpp
	src/declarative/qml/qmlcomponentjs_p.h
	src/declarative/qml/qmlcomponentjs_p_p.h

1 files changed, 19 insertions, 12 deletions

diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/gui/itemviews/qlistwidget.cpp
index a978d0f..5dd1d76 100644
--- a/src/gui/itemviews/qlistwidget.cpp
+++ b/src/gui/itemviews/qlistwidget.cpp
@@ -169,6 +169,20 @@ QListWidgetItem *QListModel::take(int row)
     return item;
 }
 
+void QListModel::move(int srcRow, int dstRow)
+{
+    if (srcRow == dstRow
+        || srcRow < 0 || srcRow >= items.count()
+        || dstRow < 0 || dstRow >= items.count())
+        return;
+
+    beginMoveRows(QModelIndex(), srcRow, srcRow, QModelIndex(), dstRow);
+    if (srcRow < dstRow)
+        --dstRow;
+    items.move(srcRow, dstRow);
+    endMoveRows();
+}
+
 int QListModel::rowCount(const QModelIndex &parent) const
 {
     return parent.isValid() ? 0 : items.count();
@@ -1804,22 +1818,15 @@ void QListWidget::dropEvent(QDropEvent *event) {
 
             if (persIndexes.contains(topIndex))
                 return;
+            qSort(persIndexes); // The dropped items will remain in the same visual order.
 
             QPersistentModelIndex dropRow = model()->index(row, col, topIndex);
 
-            QList<QListWidgetItem *> taken;
-            for (int i = 0; i < persIndexes.count(); ++i)
-                taken.append(takeItem(persIndexes.at(i).row()));
-
-            // insert them back in at their new positions
+            int r = row == -1 ? count() : (dropRow.row() >= 0 ? dropRow.row() : row);
             for (int i = 0; i < persIndexes.count(); ++i) {
-                // Either at a specific point or appended
-                if (row == -1) {
-                    insertItem(count(), taken.takeFirst());
-                } else {
-                    int r = dropRow.row() >= 0 ? dropRow.row() : row;
-                    insertItem(qMin(r, count()), taken.takeFirst());
-                }
+                const QPersistentModelIndex &pIndex = persIndexes.at(i);
+                d->listModel()->move(pIndex.row(), r);
+                r = pIndex.row() + 1;   // Dropped items are inserted contiguously and in the right order.
             }
 
             event->accept();