Merge remote-tracking branch 'origin/3.0'

2013-11-22 09:11:51 +01:00
parent 759fd36a1e cf3a9b0192
commit 559e66cb35
105 changed files with 2534 additions and 463 deletions
--- 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();
 }