Merge remote-tracking branch 'origin/10.0'

Change-Id: I7cfdfc13097d5037fea597ecba98ae902a0c5afb
2023-05-12 12:24:39 +02:00
parent aca8e5906b af5e50edf7
commit 51df19270b
5 changed files with 22 additions and 8 deletions
--- a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
@@ -102,6 +102,9 @@ static void buildAcceptor(const FilePath &projectPath, const QString &displayNam
        || !cmakeProject->activeTarget()->activeBuildConfiguration())
        return;

+    if (BuildManager::isBuilding(cmakeProject))
+        BuildManager::cancel();
+
    // Find the make step
    const BuildStepList *buildStepList =
        cmakeProject->activeTarget()->activeBuildConfiguration()->buildSteps();