feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

PE: Do not let user enable a kit that has errors

Browse Source 
If a kit has errors it still could get enabled by using
its context menu on the Project view.
Avoid this and its side effects.

Change-Id: I2434cd3c540c1f3c287b84258391450693df986a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2019-07-18 07:47:17 +02:00
parent 0e49fc2d16
commit b3d9647582
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/targetsettingspanel.cpp
View File

@@ -399,7 +399,7 @@ public:
if (role == ContextMenuItemAdderRole) { if (role == ContextMenuItemAdderRole) {
auto *menu = data.value<QMenu *>(); auto *menu = data.value<QMenu *>();
addToContextMenu(menu); addToContextMenu(menu, flags(column) & Qt::ItemIsSelectable);
return true; return true;
} }
@@ -440,7 +440,7 @@ public:
return false; return false;
} }
void addToContextMenu(QMenu *menu) void addToContextMenu(QMenu *menu, bool isSelectable)
{ {
Kit *kit = KitManager::kit(m_kitId); Kit *kit = KitManager::kit(m_kitId);
QTC_ASSERT(kit, return); QTC_ASSERT(kit, return);
@@ -448,13 +448,13 @@ public:
const QString projectName = m_project->displayName(); const QString projectName = m_project->displayName();
QAction *enableAction = menu->addAction(tr("Enable Kit \"%1\" for Project \"%2\"").arg(kitName, projectName)); QAction *enableAction = menu->addAction(tr("Enable Kit \"%1\" for Project \"%2\"").arg(kitName, projectName));
enableAction->setEnabled(m_kitId.isValid() && !isEnabled()); enableAction->setEnabled(isSelectable && m_kitId.isValid() && !isEnabled());
QObject::connect(enableAction, &QAction::triggered, [this, kit] { QObject::connect(enableAction, &QAction::triggered, [this, kit] {
m_project->addTarget(m_project->createTarget(kit)); m_project->addTarget(m_project->createTarget(kit));
}); });
QAction *disableAction = menu->addAction(tr("Disable Kit \"%1\" for Project \"%2\"").arg(kitName, projectName)); QAction *disableAction = menu->addAction(tr("Disable Kit \"%1\" for Project \"%2\"").arg(kitName, projectName));
disableAction->setEnabled(m_kitId.isValid() && isEnabled()); disableAction->setEnabled(isSelectable && m_kitId.isValid() && isEnabled());
QObject::connect(disableAction, &QAction::triggered, m_project, [this] { QObject::connect(disableAction, &QAction::triggered, m_project, [this] {
Target *t = target(); Target *t = target();
QTC_ASSERT(t, return); QTC_ASSERT(t, return);