Commit 99232c95 authored by dt's avatar dt
Browse files

Prepend qmake to the Effective qmake call text edit.

Consistent with the way the summary is written.

Task-Nr: 259513
parent ae6ce8e4
...@@ -241,9 +241,10 @@ void QMakeStepConfigWidget::qmakeArgumentsLineEditTextEdited() ...@@ -241,9 +241,10 @@ void QMakeStepConfigWidget::qmakeArgumentsLineEditTextEdited()
{ {
Q_ASSERT(!m_buildConfiguration.isNull()); Q_ASSERT(!m_buildConfiguration.isNull());
m_step->setValue(m_buildConfiguration, "qmakeArgs", ProjectExplorer::Environment::parseCombinedArgString(m_ui.qmakeAdditonalArgumentsLineEdit->text())); m_step->setValue(m_buildConfiguration, "qmakeArgs", ProjectExplorer::Environment::parseCombinedArgString(m_ui.qmakeAdditonalArgumentsLineEdit->text()));
m_ui.qmakeArgumentsEdit->setPlainText(ProjectExplorer::Environment::joinArgumentList(m_step->arguments(m_buildConfiguration)));
static_cast<Qt4Project *>(m_step->project())->invalidateCachedTargetInformation(); static_cast<Qt4Project *>(m_step->project())->invalidateCachedTargetInformation();
updateTitleLabel(); updateTitleLabel();
updateEffectiveQMakeCall();
} }
void QMakeStepConfigWidget::buildConfigurationChanged() void QMakeStepConfigWidget::buildConfigurationChanged()
...@@ -256,9 +257,9 @@ void QMakeStepConfigWidget::buildConfigurationChanged() ...@@ -256,9 +257,9 @@ void QMakeStepConfigWidget::buildConfigurationChanged()
buildConfiguration = QtVersion::QmakeBuildConfig(buildConfiguration & ~QtVersion::DebugBuild); buildConfiguration = QtVersion::QmakeBuildConfig(buildConfiguration & ~QtVersion::DebugBuild);
} }
m_step->project()->setValue(m_buildConfiguration, "buildConfiguration", int(buildConfiguration)); m_step->project()->setValue(m_buildConfiguration, "buildConfiguration", int(buildConfiguration));
m_ui.qmakeArgumentsEdit->setPlainText(ProjectExplorer::Environment::joinArgumentList(m_step->arguments(m_buildConfiguration)));
static_cast<Qt4Project *>(m_step->project())->invalidateCachedTargetInformation(); static_cast<Qt4Project *>(m_step->project())->invalidateCachedTargetInformation();
updateTitleLabel(); updateTitleLabel();
updateEffectiveQMakeCall();
} }
QString QMakeStepConfigWidget::displayName() const QString QMakeStepConfigWidget::displayName() const
...@@ -276,10 +277,21 @@ void QMakeStepConfigWidget::init(const QString &buildConfiguration) ...@@ -276,10 +277,21 @@ void QMakeStepConfigWidget::init(const QString &buildConfiguration)
m_buildConfiguration = buildConfiguration; m_buildConfiguration = buildConfiguration;
QString qmakeArgs = ProjectExplorer::Environment::joinArgumentList(m_step->value(buildConfiguration, "qmakeArgs").toStringList()); QString qmakeArgs = ProjectExplorer::Environment::joinArgumentList(m_step->value(buildConfiguration, "qmakeArgs").toStringList());
m_ui.qmakeAdditonalArgumentsLineEdit->setText(qmakeArgs); m_ui.qmakeAdditonalArgumentsLineEdit->setText(qmakeArgs);
m_ui.qmakeArgumentsEdit->setPlainText(ProjectExplorer::Environment::joinArgumentList(m_step->arguments(buildConfiguration)));
bool debug = QtVersion::QmakeBuildConfig(m_step->project()->value(buildConfiguration, "buildConfiguration").toInt()) & QtVersion::DebugBuild; bool debug = QtVersion::QmakeBuildConfig(m_step->project()->value(buildConfiguration, "buildConfiguration").toInt()) & QtVersion::DebugBuild;
m_ui.buildConfigurationComboBox->setCurrentIndex(debug? 0 : 1); m_ui.buildConfigurationComboBox->setCurrentIndex(debug? 0 : 1);
updateTitleLabel(); updateTitleLabel();
updateEffectiveQMakeCall();
}
void QMakeStepConfigWidget::updateEffectiveQMakeCall()
{
const QtVersion *qtVersion = static_cast<Qt4Project *>(m_step->project())->qtVersion(m_buildConfiguration);
if (qtVersion) {
QString program = QFileInfo(qtVersion->qmakeCommand()).fileName();
m_ui.qmakeArgumentsEdit->setPlainText(program + " " + ProjectExplorer::Environment::joinArgumentList(m_step->arguments(m_buildConfiguration)));
} else {
m_ui.qmakeArgumentsEdit->setPlainText(tr("No valid qt version set."));
}
} }
//// ////
......
...@@ -109,6 +109,7 @@ private slots: ...@@ -109,6 +109,7 @@ private slots:
void update(); void update();
private: private:
void updateTitleLabel(); void updateTitleLabel();
void updateEffectiveQMakeCall();
QString m_buildConfiguration; QString m_buildConfiguration;
Ui::QMakeStep m_ui; Ui::QMakeStep m_ui;
QMakeStep *m_step; QMakeStep *m_step;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment