diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-11-22 09:11:51 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-11-22 09:11:51 +0100 |
| commit | 559e66cb353c510c2d624d60a6d28a37fa66dcb0 (patch) | |
| tree | e8cf129eaafdd6167e62427f8aa5ec3a2321b7b5 /src/plugins/cpptools/cpptoolseditorsupport.cpp | |
| parent | 759fd36a1eebb6af878b95484e9dc2ef91b90580 (diff) | |
| parent | cf3a9b019204e734324f9eedd128f2547e4a2e79 (diff) | |
| download | qt-creator-559e66cb353c510c2d624d60a6d28a37fa66dcb0.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Diffstat (limited to 'src/plugins/cpptools/cpptoolseditorsupport.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolseditorsupport.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index 89e787d081..85c304cad6 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -169,6 +169,7 @@ CppEditorSupport::~CppEditorSupport() m_highlighter.cancel(); m_futureSemanticInfo.cancel(); + m_documentParser.waitForFinished(); m_highlighter.waitForFinished(); m_futureSemanticInfo.waitForFinished(); } |