diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 13:54:49 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 13:54:50 +0200 |
| commit | b55a688b61cf8d0705d8024a46e5070f7c1a18df (patch) | |
| tree | 9f78d403c56d01423a69b6a5e4b2137b27d0778a /src/widgets/itemviews | |
| parent | 5d9dcac0f2dc8da1a1ac79dbdd309654d6deabac (diff) | |
| parent | d0a6fcd925dc2a1553e2086e85f59ba76db85bef (diff) | |
| download | qtbase-b55a688b61cf8d0705d8024a46e5070f7c1a18df.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: Ic01820f2390e419a5b286643e7351e85ae032473
Diffstat (limited to 'src/widgets/itemviews')
| -rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 3f7a028fa4..88b16db93b 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -2404,12 +2404,11 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event) } break; #endif - case Qt::Key_A: - if (event->modifiers() & Qt::ControlModifier) { + default: { + if (event == QKeySequence::SelectAll && selectionMode() != NoSelection) { selectAll(); break; } - default: { #ifdef Q_WS_MAC if (event->key() == Qt::Key_O && event->modifiers() & Qt::ControlModifier && currentIndex().isValid()) { emit activated(currentIndex()); |