diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-03-21 09:58:15 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-03-21 09:58:15 +0100 |
| commit | 4bd6dee31547c58900215e7a96c6a0bcd5e931be (patch) | |
| tree | d8e9c301c8e90706f2a003ddbfee7aecb5ba81fe | |
| parent | 7931159c09402b988e34f3dfe2c05b1d8664b5ed (diff) | |
| parent | 9e443add91f20d1217f8e2f2e8d0df41de4a339b (diff) | |
| download | qt-creator-4bd6dee31547c58900215e7a96c6a0bcd5e931be.tar.gz | |
Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator
| -rw-r--r-- | src/plugins/texteditor/codeassist/genericproposalwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp index 7e53d2dda9..f59ae41d85 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp @@ -512,7 +512,7 @@ bool GenericProposalWidget::eventFilter(QObject *o, QEvent *e) { if (e->type() == QEvent::FocusOut) { abort(); -#if defined(Q_OS_DARWIN) && ! defined(QT_MAC_USE_COCOA) +#if (QT_VERSION < 0x050000) && defined(Q_OS_DARWIN) && ! defined(QT_MAC_USE_COCOA) QFocusEvent *fe = static_cast<QFocusEvent *>(e); if (fe->reason() == Qt::OtherFocusReason) { // Qt/carbon workaround @@ -559,7 +559,7 @@ bool GenericProposalWidget::eventFilter(QObject *o, QEvent *e) case Qt::Key_Tab: case Qt::Key_Return: -#if defined(QT_MAC_USE_COCOA) || !defined(Q_OS_DARWIN) +#if (QT_VERSION >= 0x050000) || (defined(QT_MAC_USE_COCOA) || !defined(Q_OS_DARWIN)) abort(); if (d->m_completionListView->currentIndex().isValid()) emit proposalItemActivated(d->m_model->proposalItem( |