diff options
Diffstat (limited to 'src/widgets/itemviews/qabstractitemview.cpp')
| -rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 24be27a8e5..6ecf5a664f 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -340,8 +340,8 @@ void QAbstractItemViewPrivate::_q_scrollerStateChanged() This enum indicates how the view responds to user selections: \value SingleSelection When the user selects an item, any already-selected - item becomes unselected, and the user cannot unselect the selected item by - clicking on it. + item becomes unselected. It is possible for the user to deselect the selected + item. \value ContiguousSelection When the user selects an item in the usual way, the selection is cleared and the new item selected. However, if the user @@ -2478,10 +2478,12 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event) break; #endif default: { +#ifndef QT_NO_SHORTCUT if (event == QKeySequence::SelectAll && selectionMode() != NoSelection) { selectAll(); break; } +#endif #ifdef Q_OS_OSX if (event->key() == Qt::Key_O && event->modifiers() & Qt::ControlModifier && currentIndex().isValid()) { emit activated(currentIndex()); @@ -3696,7 +3698,7 @@ QStyleOptionViewItem QAbstractItemView::viewOptions() const option.state &= ~QStyle::State_MouseOver; option.font = font(); -#ifndef Q_DEAD_CODE_FROM_QT4_MAC +#if 1 // Used to be excluded in Qt4 for Q_WS_MAC // On mac the focus appearance follows window activation // not widget activation if (!hasFocus()) |