Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: Iebedaa967a263854f18cd403ce007d7965f26d2b

2 files changed, 1 insertions, 10 deletions

diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp
index 22067851cb..702e290da3 100644
--- a/src/widgets/itemviews/qstyleditemdelegate.cpp
+++ b/src/widgets/itemviews/qstyleditemdelegate.cpp
@@ -514,15 +514,6 @@ void QStyledItemDelegate::updateEditorGeometry(QWidget *editor,
 
     QStyle *style = widget ? widget->style() : QApplication::style();
     QRect geom = style->subElementRect(QStyle::SE_ItemViewItemText, &opt, widget);
-    const int delta = qSmartMinSize(editor).width() - geom.width();
-    if (delta > 0) {
-        //we need to widen the geometry
-        if (editor->layoutDirection() == Qt::RightToLeft)
-            geom.adjust(-delta, 0, 0, 0);
-        else
-            geom.adjust(0, 0, delta, 0);
-    }
-
     editor->setGeometry(geom);
 }
 
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index c50156bbce..11c5be10fd 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -3331,7 +3331,7 @@ void QTableViewPrivate::selectRow(int row, bool anchor)
         if (q->selectionMode() != QTableView::SingleSelection
             && command.testFlag(QItemSelectionModel::Toggle)) {
             if (anchor)
-                ctrlDragSelectionFlag = verticalHeader->selectionModel()->selectedRows().contains(index)
+                ctrlDragSelectionFlag = verticalHeader->selectionModel()->selectedRows(column).contains(index)
                                     ? QItemSelectionModel::Deselect : QItemSelectionModel::Select;
             command &= ~QItemSelectionModel::Toggle;
             command |= ctrlDragSelectionFlag;