diff options
author | Christian Kandeler <[email protected]> | 2021-10-21 14:05:40 +0200 |
---|---|---|
committer | Christian Kandeler <[email protected]> | 2021-10-22 09:06:09 +0000 |
commit | 9f7cdd6d3cf2d72cfd385058422daebd256a12f0 (patch) | |
tree | 9e2d2ee788fc6c802160cb5f4598cd6ebf8191e8 /src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp | |
parent | 0a7935d4490001691b3846f6fa10c66e765dd65e (diff) |
CompilationDbProjectManager: Fix tree scanning
- We checked for the QFuture's canceled status at a time where it would
always yield true.
- A pointless default value was used for the project root path.
Fixes: QTCREATORBUG-26356
Change-Id: I4d17c6ecb7e9e7e71df737d85b42feb37d3ead5d
Reviewed-by: David Schulz <[email protected]>
Diffstat (limited to 'src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp')
-rw-r--r-- | src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp index fba6ca246b9..37216a48878 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp @@ -138,9 +138,9 @@ void CompilationDbParser::stop() QList<FileNode *> CompilationDbParser::scannedFiles() const { + const bool canceled = m_treeScanner->future().isCanceled(); const TreeScanner::Result result = m_treeScanner->release(); - return m_treeScanner && !m_treeScanner->future().isCanceled() ? result.allFiles - : QList<FileNode *>(); + return !canceled ? result.allFiles : QList<FileNode *>(); } void CompilationDbParser::parserJobFinished() |