diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp index e44da23619d3e5d7b314f540e7518f0b2270ed04..964b96f7fff7ea327e21f0b5f82b1daa7146980b 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp @@ -96,9 +96,7 @@ void CMakeBuildSettingsWidget::openChangeBuildDirectoryDialog() CMakeBuildInfo info(m_buildConfiguration); CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), manager, CMakeOpenProjectWizard::ChangeDirectory, - &info, - m_buildConfiguration->target()->displayName(), - m_buildConfiguration->displayName()); + &info); if (copw.exec() == QDialog::Accepted) { project->changeBuildDirectory(m_buildConfiguration, copw.buildDirectory()); m_pathLineEdit->setText(m_buildConfiguration->rawBuildDirectory().toString()); @@ -113,9 +111,7 @@ void CMakeBuildSettingsWidget::runCMake() auto manager = static_cast<CMakeManager *>(project->projectManager()); CMakeBuildInfo info(m_buildConfiguration); CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), manager, - CMakeOpenProjectWizard::WantToUpdate, &info, - m_buildConfiguration->target()->displayName(), - m_buildConfiguration->displayName()); + CMakeOpenProjectWizard::WantToUpdate, &info); if (copw.exec() == QDialog::Accepted) project->parseCMakeLists(); } diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp index 63838bd7c172baac983b46b6554bc497ffe25969..0e7cec08a63c50c81c64f3231c24f71208d2671e 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp @@ -84,9 +84,7 @@ using namespace ProjectExplorer; ////////////// CMakeOpenProjectWizard::CMakeOpenProjectWizard(QWidget *parent, CMakeManager *cmakeManager, CMakeOpenProjectWizard::Mode mode, - const CMakeBuildInfo *info, - const QString &kitName, - const QString &buildConfigurationName) + const CMakeBuildInfo *info) : Utils::Wizard(parent), m_cmakeManager(cmakeManager), m_sourceDirectory(info->sourceDirectory), @@ -112,7 +110,7 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(QWidget *parent, CMakeManager *cm addPage(new NoCMakePage(this)); addPage(new CMakeRunPage(this, rmode, info->buildDirectory.toString(), info->arguments, - kitName, buildConfigurationName)); + m_kit->displayName(), info->displayName)); init(); } diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h index 4bcfb54bdedd4e59137c899c137f5e8efac0d2cc..89d0b1bd428d9b2e03db3a9fa42ad02900e359bb 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h @@ -77,11 +77,8 @@ public: /// used to update if we have already a .user file /// recreates or updates the cbp file /// Also used to change the build directory of one buildconfiguration or create a new buildconfiguration - CMakeOpenProjectWizard(QWidget *parent, CMakeManager *cmakeManager, - Mode mode, - const CMakeBuildInfo *info, - const QString &kitName, - const QString &buildConfigurationName); + CMakeOpenProjectWizard(QWidget *parent, CMakeManager *cmakeManager, Mode mode, + const CMakeBuildInfo *info); QString buildDirectory() const; QString sourceDirectory() const; diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index d9016ea1d602cd9bd8d422f244bd903321ae9abd..1d245a3db8bc7ec19c5b2d0b3f0a23fbe37839af 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -145,8 +145,7 @@ void CMakeProject::changeActiveBuildConfiguration(ProjectExplorer::BuildConfigur if (mode != CMakeOpenProjectWizard::Nothing) { CMakeBuildInfo info(cmakebc); - CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), m_manager, mode, &info, - bc->target()->displayName(), bc->displayName()); + CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), m_manager, mode, &info); if (copw.exec() == QDialog::Accepted) cmakebc->setInitialArguments(QString()); } @@ -566,8 +565,7 @@ Project::RestoreResult CMakeProject::fromMap(const QVariantMap &map, QString *er if (mode != CMakeOpenProjectWizard::Nothing) { CMakeBuildInfo info(activeBC); - CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), m_manager, mode, &info, - activeBC->target()->displayName(), activeBC->displayName()); + CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), m_manager, mode, &info); if (copw.exec() != QDialog::Accepted) return RestoreResult::UserAbort; else diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index f624b46383b37e022edd22f4476ef162cc927d01..4e4cb4d5a3cc7775f21e41f7ab2fcd3c8dd8e542 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -113,7 +113,7 @@ void CMakeManager::runCMake(ProjectExplorer::Project *project) CMakeBuildInfo info(bc); CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), this, CMakeOpenProjectWizard::WantToUpdate, - &info, project->activeTarget()->displayName(), bc->displayName()); + &info); if (copw.exec() == QDialog::Accepted) cmakeProject->parseCMakeLists(); }