Merge remote-tracking branch 'origin/6.0'

Change-Id: I71b19dd8ecd96a7a2a58622f68283b8635264e48
This commit is contained in:
Eike Ziller
2021-12-01 09:24:05 +01:00
106 changed files with 754 additions and 425 deletions

View File

@@ -149,6 +149,7 @@ void CMakeManager::updateCmakeActions(Node *node)
auto project = qobject_cast<CMakeProject *>(SessionManager::startupProject());
const bool visible = project && !BuildManager::isBuilding(project);
m_runCMakeAction->setVisible(visible);
m_runCMakeActionContextMenu->setEnabled(visible);
m_clearCMakeCacheAction->setVisible(visible);
m_rescanProjectAction->setVisible(visible);
enableBuildFileMenus(node);