aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp')
-rw-r--r--src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 0b240c9c0d..5601428890 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -110,6 +110,8 @@ Qt4ProjectConfigWidget::Qt4ProjectConfigWidget(Qt4Project *project)
connect(vm, SIGNAL(qtVersionsChanged()),
this, SLOT(setupQtVersionsComboBox()));
+ connect(vm, SIGNAL(qtVersionsChanged()),
+ this, SLOT(updateDetails()));
}
Qt4ProjectConfigWidget::~Qt4ProjectConfigWidget()
@@ -128,7 +130,7 @@ void Qt4ProjectConfigWidget::updateDetails()
QtVersion *version = m_pro->qtVersion(m_buildConfiguration);
QString versionString;
if (m_pro->qtVersionId(m_buildConfiguration) == 0) {
- versionString = tr("Default Qt Version");
+ versionString = tr("Default Qt Version (%1)").arg(version->name());
} else {
versionString = version->name();
}
@@ -187,15 +189,16 @@ void Qt4ProjectConfigWidget::setupQtVersionsComboBox()
disconnect(m_ui->qtVersionComboBox, SIGNAL(currentIndexChanged(QString)),
this, SLOT(qtVersionComboBoxCurrentIndexChanged(QString)));
+ QtVersionManager *vm = QtVersionManager::instance();
+
m_ui->qtVersionComboBox->clear();
- m_ui->qtVersionComboBox->addItem(tr("Default Qt Version"), 0);
+ m_ui->qtVersionComboBox->addItem(tr("Default Qt Version (%1)").arg(vm->defaultVersion()->name()), 0);
if (m_pro->qtVersionId(m_buildConfiguration) == 0) {
m_ui->qtVersionComboBox->setCurrentIndex(0);
m_ui->invalidQtWarningLabel->setVisible(false);
}
// Add Qt Versions to the combo box
- QtVersionManager *vm = QtVersionManager::instance();
const QList<QtVersion *> &versions = vm->versions();
for (int i = 0; i < versions.size(); ++i) {
m_ui->qtVersionComboBox->addItem(versions.at(i)->name(), versions.at(i)->uniqueId());