4 files changed, 46 insertions, 20 deletions

diff --git a/src/corelib/itemmodels/qidentityproxymodel.cpp b/src/corelib/itemmodels/qidentityproxymodel.cpp
index 39992eccd3..f5684c6eda 100644
--- a/src/corelib/itemmodels/qidentityproxymodel.cpp
+++ b/src/corelib/itemmodels/qidentityproxymodel.cpp
@@ -313,6 +313,30 @@ bool QIdentityProxyModel::removeRows(int row, int count, const QModelIndex& pare
 
 /*!
     \reimp
+    \since 5.15
+ */
+bool QIdentityProxyModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)
+{
+    Q_ASSERT(sourceParent.isValid() ? sourceParent.model() == this : true);
+    Q_ASSERT(destinationParent.isValid() ? destinationParent.model() == this : true);
+    Q_D(QIdentityProxyModel);
+    return d->model->moveRows(mapToSource(sourceParent), sourceRow, count, mapToSource(destinationParent), destinationChild);
+}
+
+/*!
+    \reimp
+    \since 5.15
+ */
+bool QIdentityProxyModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)
+{
+    Q_ASSERT(sourceParent.isValid() ? sourceParent.model() == this : true);
+    Q_ASSERT(destinationParent.isValid() ? destinationParent.model() == this : true);
+    Q_D(QIdentityProxyModel);
+    return d->model->moveColumns(mapToSource(sourceParent), sourceColumn, count, mapToSource(destinationParent), destinationChild);
+}
+
+/*!
+    \reimp
  */
 int QIdentityProxyModel::rowCount(const QModelIndex& parent) const
 {
diff --git a/src/corelib/itemmodels/qidentityproxymodel.h b/src/corelib/itemmodels/qidentityproxymodel.h
index 89ac89cdba..4c14e6176a 100644
--- a/src/corelib/itemmodels/qidentityproxymodel.h
+++ b/src/corelib/itemmodels/qidentityproxymodel.h
@@ -77,6 +77,8 @@ public:
     bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
     bool removeColumns(int column, int count, const QModelIndex& parent = QModelIndex()) override;
     bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
+    bool moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) override;
+    bool moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) override;
 
 protected:
     QIdentityProxyModel(QIdentityProxyModelPrivate &dd, QObject* parent);
diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp
index f4402c88dc..e4ac5da299 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.cpp
+++ b/src/corelib/itemmodels/qitemselectionmodel.cpp
@@ -1627,10 +1627,9 @@ bool QItemSelectionModel::rowIntersectsSelection(int row, const QModelIndex &par
 
     QItemSelection sel = d->ranges;
     sel.merge(d->currentSelection, d->currentCommand);
-    for (int i = 0; i < sel.count(); ++i) {
-        QItemSelectionRange range = sel.at(i);
+    for (const QItemSelectionRange &range : qAsConst(sel)) {
         if (range.parent() != parent)
-          return false;
+            return false;
         int top = range.top();
         int bottom = range.bottom();
         int left = range.left();
@@ -1661,11 +1660,13 @@ bool QItemSelectionModel::columnIntersectsSelection(int column, const QModelInde
 
     QItemSelection sel = d->ranges;
     sel.merge(d->currentSelection, d->currentCommand);
-    for (int i = 0; i < sel.count(); ++i) {
-        int left = sel.at(i).left();
-        int right = sel.at(i).right();
-        int top =  sel.at(i).top();
-        int bottom =  sel.at(i).bottom();
+    for (const QItemSelectionRange &range : qAsConst(sel)) {
+        if (range.parent() != parent)
+            return false;
+        int top = range.top();
+        int bottom = range.bottom();
+        int left = range.left();
+        int right = range.right();
         if (left <= column && right >= column) {
             for (int j = top; j <= bottom; j++) {
                 const Qt::ItemFlags flags = d->model->index(j, column, parent).flags();
diff --git a/src/corelib/itemmodels/qstringlistmodel.cpp b/src/corelib/itemmodels/qstringlistmodel.cpp
index a248cdcd38..9c87ff853a 100644
--- a/src/corelib/itemmodels/qstringlistmodel.cpp
+++ b/src/corelib/itemmodels/qstringlistmodel.cpp
@@ -301,24 +301,23 @@ bool QStringListModel::moveRows(const QModelIndex &sourceParent, int sourceRow,
 {
     if (sourceRow < 0
         || sourceRow + count - 1 >= rowCount(sourceParent)
-        || destinationChild <= 0
+        || destinationChild < 0
         || destinationChild > rowCount(destinationParent)
+        || sourceRow == destinationChild
         || sourceRow == destinationChild - 1
-        || count <= 0) {
+        || count <= 0
+        || sourceParent.isValid()
+        || destinationParent.isValid()) {
         return false;
     }
     if (!beginMoveRows(QModelIndex(), sourceRow, sourceRow + count - 1, QModelIndex(), destinationChild))
         return false;
-    /*
-    QList::move assumes that the second argument is the index where the item will end up to
-    i.e. the valid range for that argument is from 0 to QList::size()-1
-    QAbstractItemModel::moveRows when source and destinations have the same parent assumes that
-    the item will end up being in the row BEFORE the one indicated by destinationChild
-    i.e. the valid range for that argument is from 1 to QList::size()
-    For this reason we remove 1 from destinationChild when using it inside QList
-    */
-    destinationChild--;
-    const int fromRow = destinationChild < sourceRow ? (sourceRow + count - 1) : sourceRow;
+
+    int fromRow = sourceRow;
+    if (destinationChild < sourceRow)
+        fromRow += count - 1;
+    else
+        destinationChild--;
     while (count--)
         lst.move(fromRow, destinationChild);
     endMoveRows();