diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-07-27 14:48:42 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2016-07-29 12:03:07 +0000 |
commit | ad49e64ff00259fc1967768695dd5e5a0ee65c96 (patch) | |
tree | a547e6df1fa35dc5ae69960f3936d070e058887c /src/plugins/cpptools/cppsourceprocessor.cpp | |
parent | c8020af9972ddc71be291f98ecfb97f5edda7a66 (diff) | |
download | qt-creator-ad49e64ff00259fc1967768695dd5e5a0ee65c96.tar.gz |
CppTools: Cancel parsing if editor is closed
The m_parserFuture.cancel() in ~BuiltinEditorDocumentProcessor() did not
cancel anything. Thus, closing a document while the parser was running
led to a blocking UI thread.
Now it cancels at the next include directive it encounters.
Change-Id: I092fddbbd747e0bc95265b6e9b4fcc26b3f76cb3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppsourceprocessor.cpp')
-rw-r--r-- | src/plugins/cpptools/cppsourceprocessor.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppsourceprocessor.cpp b/src/plugins/cpptools/cppsourceprocessor.cpp index f238a841f7..e04d977ebf 100644 --- a/src/plugins/cpptools/cppsourceprocessor.cpp +++ b/src/plugins/cpptools/cppsourceprocessor.cpp @@ -121,6 +121,11 @@ CppSourceProcessor::CppSourceProcessor(const Snapshot &snapshot, DocumentCallbac CppSourceProcessor::~CppSourceProcessor() { } +void CppSourceProcessor::setCancelChecker(const CppSourceProcessor::CancelChecker &cancelChecker) +{ + m_preprocess.setCancelChecker(cancelChecker); +} + void CppSourceProcessor::setWorkingCopy(const WorkingCopy &workingCopy) { m_workingCopy = workingCopy; } |