feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QbsProjectManager: Fix displayed build variant in build step

Browse Source 
The initialization was lost in 2ecfda056b.

Change-Id: I40db0ea26de74aa6420ecc50c473bbcb22891238
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Christian Kandeler
2022-10-26 15:52:18 +02:00
parent 37640257db
commit 5b7729a21a
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -209,8 +209,9 @@ QbsBuildStep::QbsBuildStep(BuildStepList *bsl, Utils::Id id) :
m_buildVariant = addAspect<SelectionAspect>(); m_buildVariant = addAspect<SelectionAspect>();
m_buildVariant->setDisplayName(QbsProjectManager::Tr::tr("Build variant:")); m_buildVariant->setDisplayName(QbsProjectManager::Tr::tr("Build variant:"));
m_buildVariant->setDisplayStyle(SelectionAspect::DisplayStyle::ComboBox); m_buildVariant->setDisplayStyle(SelectionAspect::DisplayStyle::ComboBox);
m_buildVariant->addOption(ProjectExplorer::Tr::tr("Debug")); m_buildVariant->addOption({ProjectExplorer::Tr::tr("Debug"), {}, Constants::QBS_VARIANT_DEBUG});
m_buildVariant->addOption(ProjectExplorer::Tr::tr("Release")); m_buildVariant->addOption({ProjectExplorer::Tr::tr("Release"), {},
Constants::QBS_VARIANT_RELEASE});
m_selectedAbis = addAspect<ArchitecturesAspect>(); m_selectedAbis = addAspect<ArchitecturesAspect>();
m_selectedAbis->setLabelText(QbsProjectManager::Tr::tr("ABIs:")); m_selectedAbis->setLabelText(QbsProjectManager::Tr::tr("ABIs:"));
@@ -263,7 +264,9 @@ QbsBuildStep::QbsBuildStep(BuildStepList *bsl, Utils::Id id) :
connect(m_cleanInstallDir, &BaseAspect::changed, this, &QbsBuildStep::updateState); connect(m_cleanInstallDir, &BaseAspect::changed, this, &QbsBuildStep::updateState);
connect(m_forceProbes, &BaseAspect::changed, this, &QbsBuildStep::updateState); connect(m_forceProbes, &BaseAspect::changed, this, &QbsBuildStep::updateState);
connect(m_buildVariant, &SelectionAspect::changed, this, &QbsBuildStep::changeBuildVariant); connect(m_buildVariant, &SelectionAspect::changed, this, [this] {
setBuildVariant(m_buildVariant->itemValue().toString());
});
connect(m_selectedAbis, &SelectionAspect::changed, [this] { connect(m_selectedAbis, &SelectionAspect::changed, [this] {
setConfiguredArchitectures(m_selectedAbis->selectedArchitectures()); }); setConfiguredArchitectures(m_selectedAbis->selectedArchitectures()); });
} }
@@ -358,13 +361,16 @@ void QbsBuildStep::setQbsConfiguration(const QVariantMap &config)
{ {
QVariantMap tmp = config; QVariantMap tmp = config;
tmp.insert(Constants::QBS_CONFIG_PROFILE_KEY, qbsBuildSystem()->profile()); tmp.insert(Constants::QBS_CONFIG_PROFILE_KEY, qbsBuildSystem()->profile());
if (!tmp.contains(Constants::QBS_CONFIG_VARIANT_KEY)) QString buildVariant = tmp.value(Constants::QBS_CONFIG_VARIANT_KEY).toString();
tmp.insert(Constants::QBS_CONFIG_VARIANT_KEY, if (buildVariant.isEmpty()) {
QString::fromLatin1(Constants::QBS_VARIANT_DEBUG)); buildVariant = Constants::QBS_VARIANT_DEBUG;
tmp.insert(Constants::QBS_CONFIG_VARIANT_KEY, buildVariant);
}
if (tmp == m_qbsConfiguration) if (tmp == m_qbsConfiguration)
return; return;
m_qbsConfiguration = tmp; m_qbsConfiguration = tmp;
if (m_buildVariant)
m_buildVariant->setValue(m_buildVariant->indexForItemValue(buildVariant));
if (ProjectExplorer::BuildConfiguration *bc = buildConfiguration()) if (ProjectExplorer::BuildConfiguration *bc = buildConfiguration())
emit bc->buildTypeChanged(); emit bc->buildTypeChanged();
emit qbsConfigurationChanged(); emit qbsConfigurationChanged();
@@ -760,16 +766,6 @@ void QbsBuildStepConfigWidget::updatePropertyEdit(const QVariantMap &data)
propertyEdit->setText(ProcessArgs::joinArgs(propertyList)); propertyEdit->setText(ProcessArgs::joinArgs(propertyList));
} }
void QbsBuildStep::changeBuildVariant()
{
QString variant;
if (m_buildVariant->value() == 1)
variant = Constants::QBS_VARIANT_RELEASE;
else
variant = Constants::QBS_VARIANT_DEBUG;
setBuildVariant(variant);
}
void QbsBuildStepConfigWidget::changeUseDefaultInstallDir(bool useDefault) void QbsBuildStepConfigWidget::changeUseDefaultInstallDir(bool useDefault)
{ {
const GuardLocker locker(m_ignoreChanges); const GuardLocker locker(m_ignoreChanges);

1
src/plugins/qbsprojectmanager/qbsbuildstep.h
View File

@@ -89,7 +89,6 @@ private:
void finish(); void finish();
void updateState(); void updateState();
void changeBuildVariant();
QStringList configuredArchitectures() const; QStringList configuredArchitectures() const;
QVariantMap m_qbsConfiguration; QVariantMap m_qbsConfiguration;