Merge remote-tracking branch 'origin/12.0'

Conflicts:
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp

Change-Id: If96d0f0a3d48c2581e765e4afb8b23924c48bdd6
This commit is contained in:
Eike Ziller
2023-12-12 10:17:39 +01:00
10 changed files with 93 additions and 33 deletions

View File

@@ -149,7 +149,8 @@ CMakeManager::CMakeManager()
cmakeDebuggerAction.setCommandDescription(m_cmakeDebuggerAction->text());
cmakeDebuggerAction.setContainer(PEC::M_DEBUG_STARTDEBUGGING, Constants::CMAKE_DEBUGGING_GROUP);
cmakeDebuggerAction.setOnTriggered(this, [] {
ProjectExplorerPlugin::runStartupProject(PEC::DAP_CMAKE_DEBUG_RUN_MODE, false);
ProjectExplorerPlugin::runStartupProject(PEC::DAP_CMAKE_DEBUG_RUN_MODE,
/*forceSkipDeploy=*/true);
});
connect(ProjectManager::instance(), &ProjectManager::startupProjectChanged, this, [this] {