diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-02 18:42:05 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-02 18:42:05 +0100 |
commit | 100ea30a1a5ccb0af4adafbf08b8fa89fe3c0ee7 (patch) | |
tree | 0b2aca7b1533ac466e7d2312a6bd3fa1a0282ea1 /src/plugins/texteditor/codeassist/genericproposalwidget.cpp | |
parent | f86ebcbf22d7df6be60f1fc5c9f0f30a76e104d6 (diff) | |
parent | e4be9edc4d538465338b8981294aa414a43b7255 (diff) | |
download | qt-creator-100ea30a1a5ccb0af4adafbf08b8fa89fe3c0ee7.tar.gz |
Merge remote-tracking branch 'origin/3.6'
Conflicts:
src/plugins/projectexplorer/toolchainmanager.cpp
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
Change-Id: Id736c6922670c921c689219cb817b1541eaaf304
Diffstat (limited to 'src/plugins/texteditor/codeassist/genericproposalwidget.cpp')
-rw-r--r-- | src/plugins/texteditor/codeassist/genericproposalwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp index 0c974729cc..063bedb956 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp @@ -440,9 +440,9 @@ void GenericProposalWidget::notifyActivation(int index) void GenericProposalWidget::abort() { + deleteLater(); if (isVisible()) close(); - deleteLater(); } bool GenericProposalWidget::updateAndCheck(const QString &prefix) |