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

Qbs: Continue QbsInstallStep aspectification

Browse Source 
Special QbsInstallStepWidget can be dropped.

Change-Id: I9040bbaa59c9da201c66a60a6ce9285cd53cf607
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-08-25 10:36:21 +02:00
parent a2db85b11e
commit 4b98cadb3a
1 changed files with 25 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/plugins/qbsprojectmanager/qbsinstallstep.cpp
View File

@@ -57,12 +57,6 @@ const char QBS_REMOVE_FIRST[] = "Qbs.RemoveFirst";
const char QBS_DRY_RUN[] = "Qbs.DryRun"; const char QBS_DRY_RUN[] = "Qbs.DryRun";
const char QBS_KEEP_GOING[] = "Qbs.DryKeepGoing"; const char QBS_KEEP_GOING[] = "Qbs.DryKeepGoing";
class QbsInstallStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
{
public:
QbsInstallStepConfigWidget(QbsInstallStep *step);
};
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// QbsInstallStep: // QbsInstallStep:
// -------------------------------------------------------------------- // --------------------------------------------------------------------
@@ -120,11 +114,6 @@ void QbsInstallStep::doRun()
}); });
} }
ProjectExplorer::BuildStepConfigWidget *QbsInstallStep::createConfigWidget()
{
return new QbsInstallStepConfigWidget(this);
}
void QbsInstallStep::doCancel() void QbsInstallStep::doCancel()
{ {
if (m_session) if (m_session)
@@ -187,58 +176,54 @@ QbsBuildStepData QbsInstallStep::stepData() const
return data; return data;
} }
// -------------------------------------------------------------------- BuildStepConfigWidget *QbsInstallStep::createConfigWidget()
// QbsInstallStepConfigWidget:
// --------------------------------------------------------------------
QbsInstallStepConfigWidget::QbsInstallStepConfigWidget(QbsInstallStep *step) :
BuildStepConfigWidget(step)
{ {
setSummaryText(QbsInstallStep::tr("<b>Qbs:</b> %1").arg("install")); auto widget = new BuildStepConfigWidget(this);
auto installRootValueLabel = new QLabel(step->installRoot()); widget->setSummaryText(tr("<b>Qbs:</b> %1").arg("install"));
auto commandLineKeyLabel = new QLabel(QbsInstallStep::tr("Equivalent command line:")); auto installRootValueLabel = new QLabel(installRoot());
auto commandLineKeyLabel = new QLabel(tr("Equivalent command line:"));
commandLineKeyLabel->setAlignment(Qt::AlignTop); commandLineKeyLabel->setAlignment(Qt::AlignTop);
auto commandLineTextEdit = new QPlainTextEdit(this); auto commandLineTextEdit = new QPlainTextEdit(widget);
commandLineTextEdit->setReadOnly(true); commandLineTextEdit->setReadOnly(true);
commandLineTextEdit->setTextInteractionFlags(Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse); commandLineTextEdit->setTextInteractionFlags(Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse);
commandLineTextEdit->setMinimumHeight(QFontMetrics(font()).height() * 8); commandLineTextEdit->setMinimumHeight(QFontMetrics(widget->font()).height() * 8);
LayoutBuilder builder(this); LayoutBuilder builder(widget);
builder.addItems(new QLabel(QbsInstallStep::tr("Install root:")), installRootValueLabel); builder.addItems(new QLabel(tr("Install root:")), installRootValueLabel);
builder.startNewRow(); builder.startNewRow();
builder.addItem(new QLabel(QbsInstallStep::tr("Flags:"))); builder.addItem(new QLabel(tr("Flags:")));
step->m_dryRun->addToLayout(builder); m_dryRun->addToLayout(builder);
step->m_keepGoing->addToLayout(builder); m_keepGoing->addToLayout(builder);
step->m_cleanInstallRoot->addToLayout(builder); m_cleanInstallRoot->addToLayout(builder);
builder.startNewRow(); builder.startNewRow();
builder.addItems(commandLineKeyLabel, commandLineTextEdit); builder.addItems(commandLineKeyLabel, commandLineTextEdit);
const auto updateState = [this, step, commandLineTextEdit, installRootValueLabel] { const auto updateState = [this, commandLineTextEdit, installRootValueLabel] {
QString installRoot = step->installRoot(); installRootValueLabel->setText(installRoot());
installRootValueLabel->setText(installRoot); commandLineTextEdit->setPlainText(buildConfig()->equivalentCommandLine(stepData()));
QString command = step->buildConfig()->equivalentCommandLine(step->stepData());
commandLineTextEdit->setPlainText(command);
}; };
connect(step->target(), &Target::parsingFinished, this, updateState); connect(target(), &Target::parsingFinished, this, updateState);
connect(step, &ProjectConfiguration::displayNameChanged, this, updateState); connect(this, &ProjectConfiguration::displayNameChanged, this, updateState);
connect(step->m_dryRun, &BoolAspect::changed, this, updateState); connect(m_dryRun, &BoolAspect::changed, this, updateState);
connect(step->m_keepGoing, &BoolAspect::changed, this, updateState); connect(m_keepGoing, &BoolAspect::changed, this, updateState);
connect(step->m_cleanInstallRoot, &BoolAspect::changed, this, updateState); connect(m_cleanInstallRoot, &BoolAspect::changed, this, updateState);
const QbsBuildConfiguration * const bc = step->buildConfig(); const QbsBuildConfiguration * const bc = buildConfig();
connect(bc, &QbsBuildConfiguration::qbsConfigurationChanged, this, updateState); connect(bc, &QbsBuildConfiguration::qbsConfigurationChanged, this, updateState);
if (bc->qbsStep()) if (bc->qbsStep())
connect(bc->qbsStep(), &QbsBuildStep::qbsBuildOptionsChanged, this, updateState); connect(bc->qbsStep(), &QbsBuildStep::qbsBuildOptionsChanged, this, updateState);
updateState(); updateState();
return widget;
} }
// -------------------------------------------------------------------- // --------------------------------------------------------------------