From 8d22d687d99684f143b374b13ad0994d996dcb65 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Thu, 17 Mar 2011 15:11:12 +0100
Subject: [PATCH] Qt4 Options Page: Show S60 paths even if qt is invalid

Because qt might be invalid due to the s60 paths being wrong.
Ensure the paths edits are only shown fro s60 versions.
---
 src/plugins/qt4projectmanager/qtoptionspage.cpp  | 37 +++++++++++++++---------
 src/plugins/qt4projectmanager/qtoptionspage.h    |  1 +
 src/plugins/qt4projectmanager/qtversionmanager.h |  1 +
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp
index 8ecb72d3c4..7ad7caa4ce 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.cpp
+++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp
@@ -621,20 +621,29 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item)
         return;
 
     QtVersion *qtVersion = m_versions.at(index);
-    if (!qtVersion->isValid()) {
-        m_versionUi->errorLabel->setText(qtVersion->invalidReason());
-        return;
-    }
 
-    ProjectExplorer::Abi qtAbi = qtVersion->qtAbis().at(0);
-
-    if (qtAbi.os() == ProjectExplorer::Abi::SymbianOS) {
-        makeS60Visible(true);
-        m_versionUi->s60SDKPath->setPath(QDir::toNativeSeparators(m_versions.at(index)->systemRoot()));
-        m_versionUi->sbsV2Path->setPath(m_versions.at(index)->sbsV2Directory());
-        m_versionUi->sbsV2Path->setEnabled(m_versions.at(index)->isBuildWithSymbianSbsV2());
+    QList<ProjectExplorer::Abi> abis = qtVersion->qtAbis();
+    if (!abis.isEmpty()) {
+        ProjectExplorer::Abi qtAbi = qtVersion->qtAbis().at(0);
+        if (qtAbi.os() == ProjectExplorer::Abi::SymbianOS) {
+            makeS60Visible(true);
+            m_versionUi->s60SDKPath->setPath(QDir::toNativeSeparators(m_versions.at(index)->systemRoot()));
+            m_versionUi->sbsV2Path->setPath(m_versions.at(index)->sbsV2Directory());
+            m_versionUi->sbsV2Path->setEnabled(m_versions.at(index)->isBuildWithSymbianSbsV2());
+        }
     }
-    m_versionUi->errorLabel->setText(m_versions.at(index)->description());
+    updateDescriptionLabel();
+}
+
+void QtOptionsPageWidget::updateDescriptionLabel()
+{
+    QtVersion *version = currentVersion();
+    if (!version)
+        m_versionUi->errorLabel->setText("");
+    else if (version->isValid())
+        m_versionUi->errorLabel->setText(version->description());
+    else
+        m_versionUi->errorLabel->setText(version->invalidReason());
 }
 
 int QtOptionsPageWidget::indexForTreeItem(const QTreeWidgetItem *item) const
@@ -701,7 +710,7 @@ void QtOptionsPageWidget::updateCurrentQtName()
         return;
     m_versions[currentItemIndex]->setDisplayName(m_versionUi->nameEdit->text());
     currentItem->setText(0, m_versions[currentItemIndex]->displayName());
-    m_versionUi->errorLabel->setText(m_versions.at(currentItemIndex)->description());
+    updateDescriptionLabel();
 }
 
 
@@ -779,6 +788,7 @@ void QtOptionsPageWidget::updateCurrentS60SDKDirectory()
     if (currentItemIndex < 0)
         return;
     m_versions[currentItemIndex]->setSystemRoot(m_versionUi->s60SDKPath->path());
+    updateDescriptionLabel();
 }
 
 void QtOptionsPageWidget::updateCurrentSbsV2Directory()
@@ -789,6 +799,7 @@ void QtOptionsPageWidget::updateCurrentSbsV2Directory()
     if (currentItemIndex < 0)
         return;
     m_versions[currentItemIndex]->setSbsV2Directory(m_versionUi->sbsV2Path->path());
+    updateDescriptionLabel();
 }
 
 QList<QtVersion *> QtOptionsPageWidget::versions() const
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.h b/src/plugins/qt4projectmanager/qtoptionspage.h
index eafdce4cf6..db40b9f212 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.h
+++ b/src/plugins/qt4projectmanager/qtoptionspage.h
@@ -109,6 +109,7 @@ private slots:
     void debuggingHelperBuildFinished(int qtVersionId, DebuggingHelperBuildTask::Tools tools, const QString &output);
 
 private:
+    void updateDescriptionLabel();
     void showDebuggingBuildLog(const QTreeWidgetItem *currentItem);
 };
 
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index ccc2ea27a8..2da91fd346 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -97,6 +97,7 @@ public:
 
     bool isValid() const;
     bool toolChainAvailable() const;
+
     QString invalidReason() const;
     QString description() const;
     bool isAutodetected() const { return m_isAutodetected; }
-- 
2.11.0