diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index f4e9c429acd..5c86ca03327 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -241,9 +241,10 @@ void QMakeStepConfigWidget::qmakeArgumentsLineEditTextEdited() { Q_ASSERT(!m_buildConfiguration.isNull()); 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(m_step->project())->invalidateCachedTargetInformation(); updateTitleLabel(); + updateEffectiveQMakeCall(); } void QMakeStepConfigWidget::buildConfigurationChanged() @@ -256,9 +257,9 @@ void QMakeStepConfigWidget::buildConfigurationChanged() buildConfiguration = QtVersion::QmakeBuildConfig(buildConfiguration & ~QtVersion::DebugBuild); } m_step->project()->setValue(m_buildConfiguration, "buildConfiguration", int(buildConfiguration)); - m_ui.qmakeArgumentsEdit->setPlainText(ProjectExplorer::Environment::joinArgumentList(m_step->arguments(m_buildConfiguration))); static_cast(m_step->project())->invalidateCachedTargetInformation(); updateTitleLabel(); + updateEffectiveQMakeCall(); } QString QMakeStepConfigWidget::displayName() const @@ -276,10 +277,21 @@ void QMakeStepConfigWidget::init(const QString &buildConfiguration) m_buildConfiguration = buildConfiguration; QString qmakeArgs = ProjectExplorer::Environment::joinArgumentList(m_step->value(buildConfiguration, "qmakeArgs").toStringList()); 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; m_ui.buildConfigurationComboBox->setCurrentIndex(debug? 0 : 1); updateTitleLabel(); + updateEffectiveQMakeCall(); +} + +void QMakeStepConfigWidget::updateEffectiveQMakeCall() +{ + const QtVersion *qtVersion = static_cast(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.")); + } } //// diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h index 98df23c0e64..adea8f81f06 100644 --- a/src/plugins/qt4projectmanager/qmakestep.h +++ b/src/plugins/qt4projectmanager/qmakestep.h @@ -109,6 +109,7 @@ private slots: void update(); private: void updateTitleLabel(); + void updateEffectiveQMakeCall(); QString m_buildConfiguration; Ui::QMakeStep m_ui; QMakeStep *m_step;