diff options
Diffstat (limited to 'src/plugins/projectexplorer/targetsettingspanel.cpp')
-rw-r--r-- | src/plugins/projectexplorer/targetsettingspanel.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp index b6789293df9..78d7daabc8f 100644 --- a/src/plugins/projectexplorer/targetsettingspanel.cpp +++ b/src/plugins/projectexplorer/targetsettingspanel.cpp @@ -208,7 +208,7 @@ class TargetGroupItemPrivate : public QObject public: TargetGroupItemPrivate(TargetGroupItem *q, Project *project); - ~TargetGroupItemPrivate(); + ~TargetGroupItemPrivate() override; void handleRemovedKit(Kit *kit); void handleAddedKit(Kit *kit); @@ -302,7 +302,7 @@ public: Qt::ItemFlags flags(int column) const override { Q_UNUSED(column) - return m_kitErrorsForProject ? Qt::ItemFlags(0) + return m_kitErrorsForProject ? Qt::ItemFlags({}) : Qt::ItemFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); } @@ -375,7 +375,7 @@ public: Q_UNUSED(column) if (role == ContextMenuItemAdderRole) { - QMenu *menu = data.value<QMenu *>(); + auto *menu = data.value<QMenu *>(); addToContextMenu(menu); return true; } @@ -663,7 +663,7 @@ public: { Q_UNUSED(column) if (role == ContextMenuItemAdderRole) { - QMenu *menu = data.value<QMenu *>(); + auto *menu = data.value<QMenu *>(); auto enableAction = menu->addAction(tr("Enable Kit")); enableAction->setEnabled(!isEnabled()); QObject::connect(enableAction, &QAction::triggered, [this] { @@ -690,22 +690,19 @@ public: }; TargetGroupItem::TargetGroupItem(const QString &displayName, Project *project) - : d(new TargetGroupItemPrivate(this, project)) + : d(std::make_unique<TargetGroupItemPrivate>(this, project)) { d->m_displayName = displayName; QObject::connect(project, &Project::addedTarget, - d, &TargetGroupItemPrivate::handleTargetAdded, + d.get(), &TargetGroupItemPrivate::handleTargetAdded, Qt::QueuedConnection); QObject::connect(project, &Project::removedTarget, - d, &TargetGroupItemPrivate::handleTargetRemoved); + d.get(), &TargetGroupItemPrivate::handleTargetRemoved); QObject::connect(project, &Project::activeTargetChanged, - d, &TargetGroupItemPrivate::handleTargetChanged, Qt::QueuedConnection); + d.get(), &TargetGroupItemPrivate::handleTargetChanged, Qt::QueuedConnection); } -TargetGroupItem::~TargetGroupItem() -{ - delete d; -} +TargetGroupItem::~TargetGroupItem() = default; TargetGroupItemPrivate::TargetGroupItemPrivate(TargetGroupItem *q, Project *project) : q(q), m_project(project) @@ -805,7 +802,7 @@ void TargetItem::updateSubItems() if (childCount() == 0 && isEnabled()) m_currentChild = DefaultPage; // We will add children below. removeChildren(); - if (isEnabled()) { + if (isEnabled() && !m_kitErrorsForProject) { if (m_project->needsBuildConfigurations()) appendChild(new BuildOrRunItem(m_project, m_kitId, BuildOrRunItem::BuildPage)); appendChild(new BuildOrRunItem(m_project, m_kitId, BuildOrRunItem::RunPage)); |