diff options
Diffstat (limited to 'src/plugins/projectexplorer/buildstepspage.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/buildstepspage.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp index ea795fec1a..5d44ba143a 100644 --- a/src/plugins/projectexplorer/buildstepspage.cpp +++ b/src/plugins/projectexplorer/buildstepspage.cpp @@ -253,7 +253,7 @@ void BuildStepListWidget::updateEnabledState() void BuildStepListWidget::updateAddBuildStepMenu() { - QMap<QString, QPair<Core::Id, BuildStepFactory *> > map; + QMap<QString, QPair<Utils::Id, BuildStepFactory *> > map; //Build up a list of possible steps and save map the display names to the (internal) name and factories. for (BuildStepFactory *factory : BuildStepFactory::allBuildStepFactories()) { if (factory->canHandle(m_buildStepList)) { @@ -270,12 +270,12 @@ void BuildStepListWidget::updateAddBuildStepMenu() QMenu *menu = m_addButton->menu(); menu->clear(); if (!map.isEmpty()) { - QMap<QString, QPair<Core::Id, BuildStepFactory *> >::const_iterator it, end; + QMap<QString, QPair<Utils::Id, BuildStepFactory *> >::const_iterator it, end; end = map.constEnd(); for (it = map.constBegin(); it != end; ++it) { QAction *action = menu->addAction(it.key()); BuildStepFactory *factory = it.value().second; - Core::Id id = it.value().first; + Utils::Id id = it.value().first; connect(action, &QAction::triggered, [id, factory, this]() { BuildStep *newStep = factory->create(m_buildStepList, id); @@ -381,10 +381,11 @@ void BuildStepListWidget::updateBuildStepButtonsState() connect(s->toolWidget, &ToolWidget::removeClicked, this, [this, i] { if (!m_buildStepList->removeStep(i)) { - QMessageBox::warning(Core::ICore::mainWindow(), + QMessageBox::warning(Core::ICore::dialogParent(), tr("Removing Step failed"), tr("Cannot remove build step while building"), - QMessageBox::Ok, QMessageBox::Ok); + QMessageBox::Ok, + QMessageBox::Ok); } }); |