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

Show the "real" name of the default version in build settings.

Browse Source 
Reviewed-by: dt
(cherry picked from commit 85cdc9b402)
This commit is contained in:
con
2009-08-26 15:42:24 +02:00
parent 2e0cd8cfd6
commit a11695f5e6
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View File

@@ -110,6 +110,8 @@ Qt4ProjectConfigWidget::Qt4ProjectConfigWidget(Qt4Project *project)
connect(vm, SIGNAL(qtVersionsChanged()), connect(vm, SIGNAL(qtVersionsChanged()),
this, SLOT(setupQtVersionsComboBox())); this, SLOT(setupQtVersionsComboBox()));
connect(vm, SIGNAL(qtVersionsChanged()),
this, SLOT(updateDetails()));
} }
Qt4ProjectConfigWidget::~Qt4ProjectConfigWidget() Qt4ProjectConfigWidget::~Qt4ProjectConfigWidget()
@@ -128,7 +130,7 @@ void Qt4ProjectConfigWidget::updateDetails()
QtVersion *version = m_pro->qtVersion(m_buildConfiguration); QtVersion *version = m_pro->qtVersion(m_buildConfiguration);
QString versionString; QString versionString;
if (m_pro->qtVersionId(m_buildConfiguration) == 0) { if (m_pro->qtVersionId(m_buildConfiguration) == 0) {
versionString = tr("Default Qt Version"); versionString = tr("Default Qt Version (%1)").arg(version->name());
} else { } else {
versionString = version->name(); versionString = version->name();
} }
@@ -187,15 +189,16 @@ void Qt4ProjectConfigWidget::setupQtVersionsComboBox()
disconnect(m_ui->qtVersionComboBox, SIGNAL(currentIndexChanged(QString)), disconnect(m_ui->qtVersionComboBox, SIGNAL(currentIndexChanged(QString)),
this, SLOT(qtVersionComboBoxCurrentIndexChanged(QString))); this, SLOT(qtVersionComboBoxCurrentIndexChanged(QString)));
QtVersionManager *vm = QtVersionManager::instance();
m_ui->qtVersionComboBox->clear(); 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) { if (m_pro->qtVersionId(m_buildConfiguration) == 0) {
m_ui->qtVersionComboBox->setCurrentIndex(0); m_ui->qtVersionComboBox->setCurrentIndex(0);
m_ui->invalidQtWarningLabel->setVisible(false); m_ui->invalidQtWarningLabel->setVisible(false);
} }
// Add Qt Versions to the combo box // Add Qt Versions to the combo box
QtVersionManager *vm = QtVersionManager::instance();
const QList<QtVersion *> &versions = vm->versions(); const QList<QtVersion *> &versions = vm->versions();
for (int i = 0; i < versions.size(); ++i) { for (int i = 0; i < versions.size(); ++i) {
m_ui->qtVersionComboBox->addItem(versions.at(i)->name(), versions.at(i)->uniqueId()); m_ui->qtVersionComboBox->addItem(versions.at(i)->name(), versions.at(i)->uniqueId());

2
src/plugins/qt4projectmanager/qt4projectconfigwidget.h
View File

@@ -64,12 +64,12 @@ private slots:
void manageQtVersions(); void manageQtVersions();
void selectToolChain(int index); void selectToolChain(int index);
void toggleDetails(); void toggleDetails();
void updateDetails();
private: private:
void updateToolChainCombo(); void updateToolChainCombo();
void updateImportLabel(); void updateImportLabel();
void setToolChain(int index); void setToolChain(int index);
void updateDetails();
Ui::Qt4ProjectConfigWidget *m_ui; Ui::Qt4ProjectConfigWidget *m_ui;
QAbstractButton *m_browseButton; QAbstractButton *m_browseButton;
Qt4Project *m_pro; Qt4Project *m_pro;

2
src/plugins/qt4projectmanager/qtoptionspage.cpp
View File

@@ -76,7 +76,7 @@ QString QtOptionsPage::trCategory() const
QWidget *QtOptionsPage::createPage(QWidget *parent) QWidget *QtOptionsPage::createPage(QWidget *parent)
{ {
QtVersionManager *vm = QtVersionManager::instance(); QtVersionManager *vm = QtVersionManager::instance();
m_widget = new QtOptionsPageWidget(parent, vm->versions(), vm->currentQtVersion()); m_widget = new QtOptionsPageWidget(parent, vm->versions(), vm->defaultVersion());
return m_widget; return m_widget;
} }

4
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -174,7 +174,7 @@ void QtVersionManager::updateDocumentation()
void QtVersionManager::updateExamples() void QtVersionManager::updateExamples()
{ {
QList<QtVersion *> versions; QList<QtVersion *> versions;
versions.append(currentQtVersion()); versions.append(defaultVersion());
versions.append(m_versions); versions.append(m_versions);
QString examplesPath; QString examplesPath;
@@ -334,7 +334,7 @@ void QtVersionManager::updateSystemVersion()
++m_defaultVersion; ++m_defaultVersion;
} }
QtVersion *QtVersionManager::currentQtVersion() const QtVersion *QtVersionManager::defaultVersion() const
{ {
if (m_defaultVersion < m_versions.count()) if (m_defaultVersion < m_versions.count())
return m_versions.at(m_defaultVersion); return m_versions.at(m_defaultVersion);

2
src/plugins/qt4projectmanager/qtversionmanager.h
View File

@@ -188,7 +188,7 @@ public:
QList<QtVersion *> versions() const; QList<QtVersion *> versions() const;
QtVersion *version(int id) const; QtVersion *version(int id) const;
QtVersion *currentQtVersion() const; QtVersion *defaultVersion() const;
QtVersion *qtVersionForDirectory(const QString &directory); QtVersion *qtVersionForDirectory(const QString &directory);
// Used by the projectloadwizard // Used by the projectloadwizard