diff options
| author | hjk <qtc-committer@nokia.com> | 2009-02-17 17:56:18 +0100 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-02-17 17:56:18 +0100 |
| commit | f3141d99c44bf2132b70f07c9b76b0cb801a9987 (patch) | |
| tree | 62dd903f4929c7136357bbb055c2188cbd2ec50c /src/plugins/cpptools/cppcodecompletion.cpp | |
| parent | 815bec124a04051979ebac42868aa17105c6525b (diff) | |
| parent | 7587f6e39f084c4fa88d4348d54486ae20a1b793 (diff) | |
| download | qt-creator-f3141d99c44bf2132b70f07c9b76b0cb801a9987.tar.gz | |
Merge branch '1.0.0'
Conflicts:
src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
src/plugins/debugger/gdbengine.cpp
Diffstat (limited to 'src/plugins/cpptools/cppcodecompletion.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcodecompletion.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp index 382ff50b2b..6132dadf31 100644 --- a/src/plugins/cpptools/cppcodecompletion.cpp +++ b/src/plugins/cpptools/cppcodecompletion.cpp @@ -217,6 +217,8 @@ FunctionArgumentWidget::FunctionArgumentWidget() void FunctionArgumentWidget::showFunctionHint(Function *functionSymbol, const LookupContext &context) { + m_popupFrame->hide(); + m_item = functionSymbol; m_context = context; m_startpos = m_editor->position(); @@ -230,7 +232,7 @@ void FunctionArgumentWidget::showFunctionHint(Function *functionSymbol, m_popupFrame->move(pos); m_popupFrame->show(); - QCoreApplication::instance()->installEventFilter(this); + qApp->installEventFilter(this); } void FunctionArgumentWidget::update() |