summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2013-08-21 23:22:11 +0300
committerNikolai Kosjar <nikolai.kosjar@digia.com>2013-08-23 13:51:10 +0200
commite33833c8d072158c34df1ab01bd4c02a8b173319 (patch)
tree9137bd8d911580244ca1c2b6b16108e93662b4f3 /src
parent8f470b05125e711cfe063031ff3e75a8c8c6a76a (diff)
downloadqt-creator-e33833c8d072158c34df1ab01bd4c02a8b173319.tar.gz
CodeAssistant: Do not pop again after pressing escape
If escape is pressed within 400ms after invoking completion, it is popped again Change-Id: Ibf34af22def54bc9a18d804ac9ee471f075eae96 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/texteditor/codeassist/codeassistant.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp
index 8a57304e87..5d4429ce61 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.cpp
+++ b/src/plugins/texteditor/codeassist/codeassistant.cpp
@@ -357,6 +357,7 @@ void CodeAssistantPrivate::finalizeRequest()
void CodeAssistantPrivate::finalizeProposal()
{
+ stopAutomaticProposalTimer();
m_proposal.reset();
m_proposalWidget = 0;
if (m_receivedContentWhileWaiting)