From 9e443add91f20d1217f8e2f2e8d0df41de4a339b Mon Sep 17 00:00:00 2001 From: Morten Johan Sorvig Date: Tue, 20 Mar 2012 10:16:04 +0100 Subject: [PATCH] Disable carbon workarounds on Qt 5. QT_MAC_USE_COCOA is not defined for Qt 5, which caused GenericProposalWidget to use a carbon workaround during key handling. Add QT_VERSION check. These are the only instances of QT_MAC_USE_COCOA usage in creator. Change-Id: I71ee23e14d791166ccd5645c52b152489d7f8f72 Reviewed-by: Eike Ziller --- src/plugins/texteditor/codeassist/genericproposalwidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp index 7e53d2dda99..f59ae41d856 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(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(