diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp index 9ee14d51831..7be19b9e4b0 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp +++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp @@ -34,6 +34,7 @@ #include #include +#include namespace ProjectExplorer { namespace Internal { @@ -62,7 +63,7 @@ public: private: void slotDirectoryButtonGroupChanged(); void resetDefaultBuildDirectory(); - void updateResetButton(); + void updateBuildDirectoryResetButton(); void setJomVisible(bool); @@ -80,10 +81,10 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget(QWidget *parent) : connect(m_ui.directoryButtonGroup, static_cast(&QButtonGroup::buttonClicked), this, &ProjectExplorerSettingsWidget::slotDirectoryButtonGroupChanged); - connect(m_ui.resetButton, &QAbstractButton::clicked, + connect(m_ui.buildDirectoryResetButton, &QAbstractButton::clicked, this, &ProjectExplorerSettingsWidget::resetDefaultBuildDirectory); connect(m_ui.buildDirectoryEdit, &QLineEdit::textChanged, - this, &ProjectExplorerSettingsWidget::updateResetButton); + this, &ProjectExplorerSettingsWidget::updateBuildDirectoryResetButton); auto chooser = new Core::VariableChooser(this); chooser->addSupportedWidget(m_ui.buildDirectoryEdit); @@ -180,9 +181,9 @@ void ProjectExplorerSettingsWidget::resetDefaultBuildDirectory() setBuildDirectory(QLatin1String(Core::Constants::DEFAULT_BUILD_DIRECTORY)); } -void ProjectExplorerSettingsWidget::updateResetButton() +void ProjectExplorerSettingsWidget::updateBuildDirectoryResetButton() { - m_ui.resetButton->setEnabled(buildDirectory() != QLatin1String(Core::Constants::DEFAULT_BUILD_DIRECTORY)); + m_ui.buildDirectoryResetButton->setEnabled(buildDirectory() != QLatin1String(Core::Constants::DEFAULT_BUILD_DIRECTORY)); } // ------------------ ProjectExplorerSettingsPage diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.ui b/src/plugins/projectexplorer/projectexplorersettingspage.ui index 7638d532fa2..7fecbfb38ef 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.ui +++ b/src/plugins/projectexplorer/projectexplorersettingspage.ui @@ -7,7 +7,7 @@ 0 0 831 - 507 + 520 @@ -328,7 +328,7 @@ 12 - + Default build directory: @@ -338,7 +338,7 @@ - + Reset