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

QtVersion dialog: Show invalid reason for invalid qts

Browse Source 
Reported on mailing list
This commit is contained in:
dt
2011-02-24 10:56:51 +01:00
parent 372530e35c
commit d03d13d7e8
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -610,15 +610,19 @@ void QtOptionsPageWidget::makeS60Visible(bool visible)
void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item) void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item)
{ {
if (item) { makeS60Visible(false);
m_versionUi->errorLabel->setText("");
if (!item)
return;
int index = indexForTreeItem(item); int index = indexForTreeItem(item);
QSharedPointerQtVersion qtVersion; QSharedPointerQtVersion qtVersion;
if (index >= 0) if (index < 0)
qtVersion = m_versions.at(index); return;
if (qtVersion.isNull() || !qtVersion->isValid()) { qtVersion = m_versions.at(index);
m_versionUi->errorLabel->setText(""); if (!qtVersion->isValid()) {
makeS60Visible(false); m_versionUi->errorLabel->setText(qtVersion->invalidReason());
return; return;
} }
@@ -629,13 +633,8 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item)
m_versionUi->s60SDKPath->setPath(QDir::toNativeSeparators(m_versions.at(index)->s60SDKDirectory())); m_versionUi->s60SDKPath->setPath(QDir::toNativeSeparators(m_versions.at(index)->s60SDKDirectory()));
m_versionUi->sbsV2Path->setPath(m_versions.at(index)->sbsV2Directory()); m_versionUi->sbsV2Path->setPath(m_versions.at(index)->sbsV2Directory());
m_versionUi->sbsV2Path->setEnabled(m_versions.at(index)->isBuildWithSymbianSbsV2()); m_versionUi->sbsV2Path->setEnabled(m_versions.at(index)->isBuildWithSymbianSbsV2());
} else {
makeS60Visible(false);
} }
m_versionUi->errorLabel->setText(m_versions.at(index)->description()); m_versionUi->errorLabel->setText(m_versions.at(index)->description());
} else {
makeS60Visible(false);
}
} }
int QtOptionsPageWidget::indexForTreeItem(const QTreeWidgetItem *item) const int QtOptionsPageWidget::indexForTreeItem(const QTreeWidgetItem *item) const