Commit a5af534f authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Fix QT version/mkspec reporting in Qt options page

parent 345f06a6
...@@ -444,15 +444,23 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item) ...@@ -444,15 +444,23 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item)
{ {
if (item) { if (item) {
int index = indexForTreeItem(item); int index = indexForTreeItem(item);
m_ui->errorLabel->setText("");
if (index < 0) { if (index < 0) {
makeMSVCVisible(false); makeMSVCVisible(false);
makeMingwVisible(false); makeMingwVisible(false);
makeS60Visible(false); makeS60Visible(false);
return; return;
} }
m_ui->errorLabel->setText("");
QList<ProjectExplorer::ToolChain::ToolChainType> types = m_versions.at(index)->possibleToolChainTypes(); QList<ProjectExplorer::ToolChain::ToolChainType> types = m_versions.at(index)->possibleToolChainTypes();
if (types.contains(ProjectExplorer::ToolChain::MinGW)) { if (types.isEmpty()) {
makeMSVCVisible(false);
makeMingwVisible(false);
makeS60Visible(false);
if (!m_versions.at(index)->isValid())
m_ui->errorLabel->setText(m_versions.at(index)->invalidReason());
else
m_ui->errorLabel->setText(tr("%1 does not specify a valid Qt installation").arg(QDir::toNativeSeparators(m_versions.at(index)->qmakeCommand())));
} else if (types.contains(ProjectExplorer::ToolChain::MinGW)) {
makeMSVCVisible(false); makeMSVCVisible(false);
makeMingwVisible(true); makeMingwVisible(true);
makeS60Visible(false); makeS60Visible(false);
...@@ -487,18 +495,12 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item) ...@@ -487,18 +495,12 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item)
m_ui->mwcPath->setPath(m_versions.at(index)->mwcDirectory()); m_ui->mwcPath->setPath(m_versions.at(index)->mwcDirectory());
m_ui->s60SDKPath->setPath(m_versions.at(index)->s60SDKDirectory()); m_ui->s60SDKPath->setPath(m_versions.at(index)->s60SDKDirectory());
m_ui->gccePath->setPath(m_versions.at(index)->gcceDirectory()); m_ui->gccePath->setPath(m_versions.at(index)->gcceDirectory());
} else if (types.contains(ProjectExplorer::ToolChain::INVALID)) {
makeMSVCVisible(false);
makeMingwVisible(false);
makeS60Visible(false);
if (!m_versions.at(index)->isValid())
m_ui->errorLabel->setText(m_versions.at(index)->invalidReason());
else
m_ui->errorLabel->setText(tr("%1 does not specify a valid Qt installation").arg(QDir::toNativeSeparators(m_versions.at(index)->qmakeCommand())));
} else { //ProjectExplorer::ToolChain::GCC } else { //ProjectExplorer::ToolChain::GCC
makeMSVCVisible(false); makeMSVCVisible(false);
makeMingwVisible(false); makeMingwVisible(false);
makeS60Visible(false); makeS60Visible(false);
}
if (m_ui->errorLabel->text().isEmpty()) {
m_ui->errorLabel->setText(tr("Found Qt version %1, using mkspec %2") m_ui->errorLabel->setText(tr("Found Qt version %1, using mkspec %2")
.arg(m_versions.at(index)->qtVersionString(), .arg(m_versions.at(index)->qtVersionString(),
m_versions.at(index)->mkspec())); m_versions.at(index)->mkspec()));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment