diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2021-06-01 16:58:19 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2021-06-03 10:12:02 +0000 |
| commit | 2ef2e497fc7a0f91db91d6d6a3a2cc3db03363ad (patch) | |
| tree | a4d63634c5ef9cc888f0efd7ec5523ca3a125110 | |
| parent | b9c9c37a515f9dd79fa4e9e6c8c0168d76e6d5e3 (diff) | |
| download | qt-creator-2ef2e497fc7a0f91db91d6d6a3a2cc3db03363ad.tar.gz | |
CMakePM: Cancel active C/C++ parsing before starting CMake
If CMake is being triggered when C/C++ parsing is running, make sure
to cancel() the C/C++ parsing before running CMake.
The C/C++ parsing is issued after the CMake project is loaded,
so for a subsequent CMake run there is no need to have the
system busy with C/C++ parsing and at the same time run CMake.
Change-Id: Ib9a2e057a90d9572e904ff449666bb9b12d1accc
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 560b9251ae..94eeb5032e 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -296,6 +296,10 @@ void CMakeBuildSystem::triggerParsing() reparseParameters |= REPARSE_FORCE_CMAKE_RUN | REPARSE_FORCE_EXTRA_CONFIGURATION; } + // The code model will be updated after the CMake run. There is no need to have an + // active code model updater when the next one will be triggered. + m_cppCodeModelUpdater->cancel(); + qCDebug(cmakeBuildSystemLog) << "Asking reader to parse"; m_reader.parse(reparseParameters & REPARSE_FORCE_CMAKE_RUN, reparseParameters & REPARSE_FORCE_INITIAL_CONFIGURATION, |