diff options
| author | Radovan Zivkovic <pivonroll@gmail.com> | 2013-04-18 01:12:14 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-11 19:54:53 +0100 |
| commit | 510714df623d7dd69ce59c85d7d595b1780b3fe4 (patch) | |
| tree | b523a2b146395c4fcea24f9742cf83c6e7fa48b8 | |
| parent | 430086cd3afb0028e69eef9e2937ac0d0b1c0c2e (diff) | |
| download | qt-creator-510714df623d7dd69ce59c85d7d595b1780b3fe4.tar.gz | |
VcMakeStep now remembers it's own settings.
Change-Id: I7a3be2942d764b03fccd4ecc5451e91ec3f1df1e
Reviewed-by: Bojan Petrovic <bojan85@gmail.com>
| -rw-r--r-- | src/plugins/vcprojectmanager/vcmakestep.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/plugins/vcprojectmanager/vcmakestep.cpp b/src/plugins/vcprojectmanager/vcmakestep.cpp index 1e02245497..4386f03629 100644 --- a/src/plugins/vcprojectmanager/vcmakestep.cpp +++ b/src/plugins/vcprojectmanager/vcmakestep.cpp @@ -164,11 +164,18 @@ void VcMakeStep::removeBuildArgument(const QString &buildArgument) QVariantMap VcMakeStep::toMap() const { - return BuildStep::toMap(); + QVariantMap map = BuildStep::toMap(); + map.insert(QLatin1String(Constants::VC_PROJECT_MS_BUILD_EXECUTABLE), m_msBuildCommand); + map.insert(QLatin1String(Constants::VC_PROJECT_MS_BUILD_EXECUTABLE_VERSION), m_msBuildVersion); + map.insert(QLatin1String(Constants::VC_PROJECT_MS_BUILD_ARGUMENT_LIST), m_buildArguments); + return map; } bool VcMakeStep::fromMap(const QVariantMap &map) { + m_msBuildCommand = map.value(QLatin1String(Constants::VC_PROJECT_MS_BUILD_EXECUTABLE)).toString(); + m_msBuildVersion = map.value(QLatin1String(Constants::VC_PROJECT_MS_BUILD_EXECUTABLE_VERSION)).toString(); + m_buildArguments = map.value(QLatin1String(Constants::VC_PROJECT_MS_BUILD_ARGUMENT_LIST)).toStringList(); return BuildStep::fromMap(map); } @@ -211,6 +218,9 @@ VcMakeStepConfigWidget::VcMakeStepConfigWidget(VcMakeStep *makeStep) : QString buildName = fileInfo.fileName() + QLatin1Char(' ') + msBuild->m_version; QVariant msBuildFullPath(msBuild->m_executable + QLatin1Char(';') + msBuild->m_version); m_msBuildComboBox->addItem(buildName, msBuildFullPath); + + if (msBuild->m_executable == m_makeStep->msBuildCommand() && m_msBuildComboBox->count() - 1 >= 0) + m_msBuildComboBox->setCurrentIndex(m_msBuildComboBox->count() - 1); } } } @@ -226,10 +236,12 @@ VcMakeStepConfigWidget::VcMakeStepConfigWidget(VcMakeStep *makeStep) : onMsBuildSelectionChanged(0); } + m_msBuildPath->setText(m_makeStep->msBuildCommand()); + connect(m_msBuildComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(onMsBuildSelectionChanged(int))); - connect(vcManager->buildOptionsPage(), SIGNAL(msBuildInfomationsUpdated()), + connect(vcManager->buildOptionsPage(), SIGNAL(vcOptionsUpdated()), this, SLOT(onMsBuildInformationsUpdated())); } } |