feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator

Browse Source
This commit is contained in:
Eike Ziller
2012-03-21 09:58:15 +01:00
parent 7931159c09 9e443add91
commit 4bd6dee315
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/texteditor/codeassist/genericproposalwidget.cpp
View File

@@ -512,7 +512,7 @@ bool GenericProposalWidget::eventFilter(QObject *o, QEvent *e)
{ {
if (e->type() == QEvent::FocusOut) { if (e->type() == QEvent::FocusOut) {
abort(); 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); QFocusEvent *fe = static_cast<QFocusEvent *>(e);
if (fe->reason() == Qt::OtherFocusReason) { if (fe->reason() == Qt::OtherFocusReason) {
// Qt/carbon workaround // Qt/carbon workaround
@@ -559,7 +559,7 @@ bool GenericProposalWidget::eventFilter(QObject *o, QEvent *e)
case Qt::Key_Tab: case Qt::Key_Tab:
case Qt::Key_Return: 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(); abort();
if (d->m_completionListView->currentIndex().isValid()) if (d->m_completionListView->currentIndex().isValid())
emit proposalItemActivated(d->m_model->proposalItem( emit proposalItemActivated(d->m_model->proposalItem(