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

QbsBuildStep: Some cleanup

Browse Source 
Change-Id: Ic3e7fe9a2aaabebd44acd1a61941318a0698d3e1
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-07-15 10:50:15 +02:00
parent 53d06feecd
commit de4c1adbfa
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,7 +139,7 @@ private:
QbsBuildStep *qbsStep() const; QbsBuildStep *qbsStep() const;
bool validateProperties(Utils::FancyLineEdit *edit, QString *errorMessage); bool validateProperties(FancyLineEdit *edit, QString *errorMessage);
class Property class Property
{ {
@@ -173,7 +173,7 @@ private:
// QbsBuildStep: // QbsBuildStep:
// -------------------------------------------------------------------- // --------------------------------------------------------------------
QbsBuildStep::QbsBuildStep(BuildStepList *bsl, Utils::Id id) : QbsBuildStep::QbsBuildStep(BuildStepList *bsl, Id id) :
BuildStep(bsl, id) BuildStep(bsl, id)
{ {
setDisplayName(QbsProjectManager::Tr::tr("Qbs Build")); setDisplayName(QbsProjectManager::Tr::tr("Qbs Build"));
@@ -343,7 +343,7 @@ void QbsBuildStep::setQbsConfiguration(const QVariantMap &config)
return; return;
m_qbsConfiguration = tmp; m_qbsConfiguration = tmp;
buildVariantHolder.setValue(buildVariantHolder.indexForItemValue(buildVariant)); buildVariantHolder.setValue(buildVariantHolder.indexForItemValue(buildVariant));
if (ProjectExplorer::BuildConfiguration *bc = buildConfiguration()) if (BuildConfiguration *bc = buildConfiguration())
emit bc->buildTypeChanged(); emit bc->buildTypeChanged();
emit qbsConfigurationChanged(); emit qbsConfigurationChanged();
} }
@@ -353,12 +353,12 @@ bool QbsBuildStep::hasCustomInstallRoot() const
return m_qbsConfiguration.contains(Constants::QBS_INSTALL_ROOT_KEY); return m_qbsConfiguration.contains(Constants::QBS_INSTALL_ROOT_KEY);
} }
Utils::FilePath QbsBuildStep::installRoot(VariableHandling variableHandling) const FilePath QbsBuildStep::installRoot(VariableHandling variableHandling) const
{ {
const QString root = const QString root =
qbsConfiguration(variableHandling).value(Constants::QBS_INSTALL_ROOT_KEY).toString(); qbsConfiguration(variableHandling).value(Constants::QBS_INSTALL_ROOT_KEY).toString();
if (!root.isNull()) if (!root.isNull())
return Utils::FilePath::fromUserInput(root); return FilePath::fromUserInput(root);
QString defaultInstallDir = QbsSettings::defaultInstallDirTemplate(); QString defaultInstallDir = QbsSettings::defaultInstallDirTemplate();
if (variableHandling == VariableHandling::ExpandVariables) if (variableHandling == VariableHandling::ExpandVariables)
defaultInstallDir = macroExpander()->expand(defaultInstallDir); defaultInstallDir = macroExpander()->expand(defaultInstallDir);
@@ -374,7 +374,7 @@ int QbsBuildStep::maxJobs() const
bool QbsBuildStep::fromMap(const QVariantMap &map) bool QbsBuildStep::fromMap(const QVariantMap &map)
{ {
if (!ProjectExplorer::BuildStep::fromMap(map)) if (!BuildStep::fromMap(map))
return false; return false;
setQbsConfiguration(map.value(QBS_CONFIG).toMap()); setQbsConfiguration(map.value(QBS_CONFIG).toMap());
@@ -488,7 +488,7 @@ void QbsBuildStep::setBuildVariant(const QString &variant)
return; return;
m_qbsConfiguration.insert(Constants::QBS_CONFIG_VARIANT_KEY, variant); m_qbsConfiguration.insert(Constants::QBS_CONFIG_VARIANT_KEY, variant);
emit qbsConfigurationChanged(); emit qbsConfigurationChanged();
if (ProjectExplorer::BuildConfiguration *bc = buildConfiguration()) if (BuildConfiguration *bc = buildConfiguration())
emit bc->buildTypeChanged(); emit bc->buildTypeChanged();
} }
@@ -664,7 +664,7 @@ QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step)
connect(defaultInstallDirCheckBox, &QCheckBox::toggled, this, connect(defaultInstallDirCheckBox, &QCheckBox::toggled, this,
&QbsBuildStepConfigWidget::changeUseDefaultInstallDir); &QbsBuildStepConfigWidget::changeUseDefaultInstallDir);
connect(installDirChooser, &Utils::PathChooser::rawPathChanged, this, connect(installDirChooser, &PathChooser::rawPathChanged, this,
&QbsBuildStepConfigWidget::changeInstallDir); &QbsBuildStepConfigWidget::changeInstallDir);
updateState(); updateState();
@@ -798,7 +798,7 @@ QbsBuildStep *QbsBuildStepConfigWidget::qbsStep() const
return m_qbsStep; return m_qbsStep;
} }
bool QbsBuildStepConfigWidget::validateProperties(Utils::FancyLineEdit *edit, QString *errorMessage) bool QbsBuildStepConfigWidget::validateProperties(FancyLineEdit *edit, QString *errorMessage)
{ {
ProcessArgs::SplitError err; ProcessArgs::SplitError err;
const QStringList argList = ProcessArgs::splitArgs(edit->text(), HostOsInfo::hostOs(), false, &err); const QStringList argList = ProcessArgs::splitArgs(edit->text(), HostOsInfo::hostOs(), false, &err);