summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@theqtcompany.com>2015-08-04 09:01:33 +0200
committerChristian Stenger <christian.stenger@theqtcompany.com>2015-08-17 08:33:13 +0300
commitd87b4668dc44c6a30b753e69328e71c5a2f57e31 (patch)
tree52c162212342431d4cc253a2b8fd98dd0fde844e
parent565712d84b2c7f108beb98c9f0409a41b626c14f (diff)
downloadqt-creator-d87b4668dc44c6a30b753e69328e71c5a2f57e31.tar.gz
Fix postponing when code model is parsed
If postponing a full parse unset an already postponed partial parse otherwise we could run into the Q_ASSERT statement inside onPartialParsingFinished(). Change-Id: Iee197f1e16496ea87975d5ead0e43953353ab9a7 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
-rw-r--r--plugins/autotest/testcodeparser.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/autotest/testcodeparser.cpp b/plugins/autotest/testcodeparser.cpp
index d0779f6730..b64c7f6e7d 100644
--- a/plugins/autotest/testcodeparser.cpp
+++ b/plugins/autotest/testcodeparser.cpp
@@ -117,6 +117,8 @@ void TestCodeParser::updateTestTree()
m_singleShotScheduled = false;
if (m_codeModelParsing) {
m_fullUpdatePostponed = true;
+ m_partialUpdatePostponed = false;
+ m_postponedFiles.clear();
return;
}