diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-28 01:00:14 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-28 01:00:15 +0100 |
| commit | 043f99954faa8355c9f0d78d441099a6f7e1ad8b (patch) | |
| tree | 3543e16fef20cb6f71b1374594477a4b145f9bab /src/widgets/itemviews/qabstractitemview.cpp | |
| parent | f6ce77f3e4dbc67531db7eeaf271c5416b4a4934 (diff) | |
| parent | f657c7426329d3763bbf3373b986378c22020269 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Icc9b061c56e969756f0351c936cdeb8063c86079
Diffstat (limited to 'src/widgets/itemviews/qabstractitemview.cpp')
| -rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 63803767c8..59d3ed1d15 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -1912,7 +1912,7 @@ void QAbstractItemView::mouseReleaseEvent(QMouseEvent *event) bool click = (index == d->pressedIndex && index.isValid()); bool selectedClicked = click && (event->button() == Qt::LeftButton) && d->pressedAlreadySelected; EditTrigger trigger = (selectedClicked ? SelectedClicked : NoEditTriggers); - bool edited = edit(index, trigger, event); + const bool edited = click ? edit(index, trigger, event) : false; d->ctrlDragSelectionFlag = QItemSelectionModel::NoUpdate; |