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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp
This commit is contained in:
Oswald Buddenhagen
2010-10-18 20:59:12 +02:00
parent f3cb1f0bf3 9240ceaf35
commit dfee3388af
108 changed files with 1578 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,12 +240,12 @@ void Qt4ProjectConfigWidget::qtVersionsChanged()
if (validVersions.at(i) == qtVersion)
m_ui->qtVersionComboBox->setCurrentIndex(i);
}
m_ui->qtVersionComboBox->setEnabled(validVersions.count() > 1);
}
if (!qtVersion->isValid()) {
m_ui->qtVersionComboBox->addItem(tr("Invalid Qt version"), -1);
m_ui->qtVersionComboBox->setCurrentIndex(m_ui->qtVersionComboBox->count() - 1);
}
m_ui->qtVersionComboBox->setEnabled(m_ui->qtVersionComboBox->count() > 1);
m_ignoreChange = false;
updateToolChainCombo();