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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Change-Id: I3e7049da2c3da6f784e3cb3407c22ada556e5d24
This commit is contained in:
Eike Ziller
2020-02-26 08:35:05 +01:00
parent 23946de457 fa59e02f89
commit 61dc14b67f
419 changed files with 18939 additions and 2729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -669,6 +669,7 @@ QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) :
connect(forceProbesCheckBox, &QCheckBox::toggled, this,
&QbsBuildStepConfigWidget::changeForceProbes);
updateState();
setSummaryText(tr("<b>Qbs:</b> %1").arg("build"));
}
void QbsBuildStepConfigWidget::updateState()
@@ -714,8 +715,6 @@ void QbsBuildStepConfigWidget::updateState()
Constants::QBS_CONFIG_QUICK_COMPILER_KEY);
commandLineTextEdit->setPlainText(command);
setSummaryText(tr("<b>Qbs:</b> %1").arg(command));
}