diff options
| author | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2023-01-16 01:09:58 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2023-01-17 12:53:10 +0900 |
| commit | 010a8987710f4aafcd34ce2359464cfab10dad46 (patch) | |
| tree | 45a1df8c05eb174effd5cd9bfe2ac8b7d6f651e7 /src/widgets/itemviews/qabstractitemview.cpp | |
| parent | 1613975d954f0d88ca8cdde59b34c13d72e9d140 (diff) | |
Fix build with -no-feature-draganddrop
Pick-to: 6.5
Change-Id: I88ecd9a84d7fb9f6cb78027cc51e34089e211ff2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/widgets/itemviews/qabstractitemview.cpp')
| -rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 7a7b5c4753..1619635dbf 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -1793,9 +1793,11 @@ void QAbstractItemView::mousePressEvent(QMouseEvent *event) QPoint offset = d->offset(); d->draggedPosition = pos + offset; +#if QT_CONFIG(draganddrop) // update the pressed position when drag was enable if (d->dragEnabled) d->pressedPosition = d->draggedPosition; +#endif if (!(command & QItemSelectionModel::Current)) { d->pressedPosition = pos + offset; @@ -4127,13 +4129,21 @@ QItemSelectionModel::SelectionFlags QAbstractItemViewPrivate::multiSelectionComm case QEvent::MouseButtonPress: if (static_cast<const QMouseEvent*>(event)->button() == Qt::LeftButton) { // since the press might start a drag, deselect only on release - if (!pressedAlreadySelected || !dragEnabled || !isIndexDragEnabled(index)) + if (!pressedAlreadySelected +#if QT_CONFIG(draganddrop) + || !dragEnabled || !isIndexDragEnabled(index) +#endif + ) return QItemSelectionModel::Toggle|selectionBehaviorFlags(); // toggle } break; case QEvent::MouseButtonRelease: if (static_cast<const QMouseEvent*>(event)->button() == Qt::LeftButton) { - if (pressedAlreadySelected && dragEnabled && isIndexDragEnabled(index) && index == pressedIndex) + if (pressedAlreadySelected +#if QT_CONFIG(draganddrop) + && dragEnabled && isIndexDragEnabled(index) +#endif + && index == pressedIndex) return QItemSelectionModel::Toggle|selectionBehaviorFlags(); return QItemSelectionModel::NoUpdate|selectionBehaviorFlags(); // finalize } @@ -4181,7 +4191,10 @@ QItemSelectionModel::SelectionFlags QAbstractItemViewPrivate::extendedSelectionC return QItemSelectionModel::NoUpdate; // since the press might start a drag, deselect only on release if (controlKeyPressed && !rightButtonPressed && pressedAlreadySelected - && dragEnabled && isIndexDragEnabled(index)) { +#if QT_CONFIG(draganddrop) + && dragEnabled && isIndexDragEnabled(index) +#endif + ) { return QItemSelectionModel::NoUpdate; } break; @@ -4197,7 +4210,10 @@ QItemSelectionModel::SelectionFlags QAbstractItemViewPrivate::extendedSelectionC && !shiftKeyPressed && !controlKeyPressed && (!rightButtonPressed || !index.isValid())) return QItemSelectionModel::ClearAndSelect|selectionBehaviorFlags(); if (index == pressedIndex && controlKeyPressed && !rightButtonPressed - && dragEnabled && isIndexDragEnabled(index)) { +#if QT_CONFIG(draganddrop) + && dragEnabled && isIndexDragEnabled(index) +#endif + ) { break; } return QItemSelectionModel::NoUpdate; @@ -4661,6 +4677,7 @@ void QAbstractItemViewPrivate::selectAll(QItemSelectionModel::SelectionFlags com selectionModel->select(selection, command); } +#if QT_CONFIG(draganddrop) QModelIndexList QAbstractItemViewPrivate::selectedDraggableIndexes() const { Q_Q(const QAbstractItemView); @@ -4671,6 +4688,7 @@ QModelIndexList QAbstractItemViewPrivate::selectedDraggableIndexes() const indexes.removeIf(isNotDragEnabled); return indexes; } +#endif /*! \reimp |