From a269232df9e1e861e6f2cfb33daa6fb7d4becc55 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 22 Jun 2010 14:16:49 +0200
Subject: [PATCH] Update Qt version combobox
* Update the Qt version combobox whenever the buildconfig signals
that its Qt version changed.
Task-number: QTCREATORBUG-1692
Reviewed-by: dt
---
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index e08651e769c..5838c97a109 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -215,6 +215,11 @@ void Qt4ProjectConfigWidget::qtVersionChanged()
if (m_ignoreChange)
return;
+ int versionId = m_buildConfiguration->qtVersion()->uniqueId();
+ int comboBoxIndex = m_ui->qtVersionComboBox->findData(QVariant(versionId), Qt::UserRole);
+ if (comboBoxIndex > -1)
+ m_ui->qtVersionComboBox->setCurrentIndex(comboBoxIndex);
+
updateShadowBuildUi();
updateImportLabel();
updateToolChainCombo();
@@ -396,7 +401,6 @@ void Qt4ProjectConfigWidget::importLabelClicked()
// So we got all the information now apply it...
m_buildConfiguration->setQtVersion(version);
- // Combo box will be updated at the end
QMakeStep *qmakeStep = m_buildConfiguration->qmakeStep();
qmakeStep->setUserArguments(additionalArguments);
--
GitLab