diff --git a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp index e6f19ee6db0..925881a4516 100644 --- a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -201,7 +202,8 @@ bool FunctionHintProposalWidget::eventFilter(QObject *obj, QEvent *e) d->m_escapePressed = true; e->accept(); } - if (d->m_model->size() > 1) { + QTC_CHECK(d->m_model); + if (d->m_model && d->m_model->size() > 1) { QKeyEvent *ke = static_cast(e); if (ke->key() == Qt::Key_Up) { previousPage(); @@ -220,10 +222,13 @@ bool FunctionHintProposalWidget::eventFilter(QObject *obj, QEvent *e) emit explicitlyAborted(); return false; } else if (ke->key() == Qt::Key_Up || ke->key() == Qt::Key_Down) { - if (d->m_model->size() > 1) + QTC_CHECK(d->m_model); + if (d->m_model && d->m_model->size() > 1) return false; } - d->m_assistant->notifyChange(); + QTC_CHECK(d->m_assistant); + if (d->m_assistant) + d->m_assistant->notifyChange(); } break; case QEvent::WindowDeactivate: