diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2014-12-09 15:10:09 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@digia.com> | 2015-01-23 10:35:14 +0100 |
| commit | 906577c8b0045724b9b961926085e933c8e0d339 (patch) | |
| tree | 25a3f72ebc3ae65610ce48cd5d8e27aea9206ecc /src | |
| parent | cebd6d59cb52bad59e4056691c8eb04690858897 (diff) | |
Enter/Return should cause an edit inside an itemview on OS X
This was available before but was protected with the wrong define for OS
X, so this is changed to the right define.
Task-number: QTBUG-23696
QTBUG-23703
Change-Id: I669a6cf2ff7c01020693adff9f04a4b8b9404d02
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 0f346a9682..9b8c19df6d 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -2388,7 +2388,7 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event) } #endif break; -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC case Qt::Key_Enter: case Qt::Key_Return: // Propagate the enter if you couldn't edit the item and there are no @@ -2418,7 +2418,7 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event) selectAll(); break; } -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC if (event->key() == Qt::Key_O && event->modifiers() & Qt::ControlModifier && currentIndex().isValid()) { emit activated(currentIndex()); break; |