diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-03-23 09:35:54 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-03-23 09:35:54 +0100 |
| commit | ee2840d5b8d37979ece2126055baf4678df8b312 (patch) | |
| tree | 5847c57c571e905d2e1a54ce3244de1d47ce6ecc /src/plugins/nim | |
| parent | 80a766a2cbffdedc975f6ed3ebe225bfcfb433d9 (diff) | |
| parent | e3581a3961dd4298122a8ede9488af11f2acfa08 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Change-Id: Ic741fdedc168430e5be6cb1645d9329dbc7a6b08
Diffstat (limited to 'src/plugins/nim')
| -rw-r--r-- | src/plugins/nim/project/nimblebuildconfiguration.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/nim/project/nimblebuildconfiguration.h | 2 | ||||
| -rw-r--r-- | src/plugins/nim/project/nimblebuildstepwidget.cpp | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/plugins/nim/project/nimblebuildconfiguration.cpp b/src/plugins/nim/project/nimblebuildconfiguration.cpp index 10ef13bbce..6665191a2a 100644 --- a/src/plugins/nim/project/nimblebuildconfiguration.cpp +++ b/src/plugins/nim/project/nimblebuildconfiguration.cpp @@ -56,7 +56,7 @@ NimbleBuildConfiguration::NimbleBuildConfiguration(Target *target, Core::Id id) appendInitialBuildStep(Constants::C_NIMBLEBUILDSTEP_ID); setInitializer([this](const BuildInfo &info) { - m_buildType = info.buildType; + setBuildType(info.buildType); setBuildDirectory(project()->projectDirectory()); }); } @@ -79,6 +79,13 @@ QVariantMap NimbleBuildConfiguration::toMap() const return map; } +void NimbleBuildConfiguration::setBuildType(BuildConfiguration::BuildType buildType) +{ + if (buildType == m_buildType) + return; + m_buildType = buildType; + emit buildTypeChanged(); +} NimbleBuildConfigurationFactory::NimbleBuildConfigurationFactory() { diff --git a/src/plugins/nim/project/nimblebuildconfiguration.h b/src/plugins/nim/project/nimblebuildconfiguration.h index 2d3f0a93f3..3d52af523e 100644 --- a/src/plugins/nim/project/nimblebuildconfiguration.h +++ b/src/plugins/nim/project/nimblebuildconfiguration.h @@ -45,6 +45,8 @@ class NimbleBuildConfiguration : public ProjectExplorer::BuildConfiguration QVariantMap toMap() const override; private: + void setBuildType(BuildType buildType); + BuildType m_buildType; }; diff --git a/src/plugins/nim/project/nimblebuildstepwidget.cpp b/src/plugins/nim/project/nimblebuildstepwidget.cpp index ad841a4730..aa1981e7e2 100644 --- a/src/plugins/nim/project/nimblebuildstepwidget.cpp +++ b/src/plugins/nim/project/nimblebuildstepwidget.cpp @@ -49,7 +49,7 @@ NimbleBuildStepWidget::NimbleBuildStepWidget(NimbleBuildStep *bs) QObject::connect(ui->argumentsLineEdit, &QLineEdit::textEdited, bs, &NimbleBuildStep::setArguments); ui->resetButton->setIcon(Utils::Icons::RESET.icon()); - QObject::connect(ui->resetButton, &QToolButton::triggered, bs, &NimbleBuildStep::resetArguments); + QObject::connect(ui->resetButton, &QToolButton::clicked, bs, &NimbleBuildStep::resetArguments); } NimbleBuildStepWidget::~NimbleBuildStepWidget() |