From 3ecf695c0785b02b9ad56c455d4dd3d86eebd51d Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Fri, 29 Apr 2011 15:39:01 +0200
Subject: [PATCH] QmlDebugging: Show helper list also for Symbian Qt versions

---
 src/plugins/qt4projectmanager/qtoptionspage.cpp    | 2 +-
 src/plugins/qt4projectmanager/qtversionmanager.cpp | 7 -------
 src/plugins/qt4projectmanager/qtversionmanager.h   | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp
index e08562ad706..50a0b7b0ac1 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.cpp
+++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp
@@ -471,7 +471,7 @@ void QtOptionsPageWidget::updateDebuggingHelperUi()
     const QtVersion *version = currentVersion();
     const QTreeWidgetItem *currentItem = m_ui->qtdirList->currentItem();
 
-    if (!version || !version->supportsBinaryDebuggingHelper()) {
+    if (!version || !version->isValid()) {
         m_ui->debuggingHelperWidget->setVisible(false);
     } else {
         const DebuggingHelperBuildTask::Tools availableTools = DebuggingHelperBuildTask::availableTools(version);
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 4bd0d55b758..c181beb9d28 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -2005,13 +2005,6 @@ QStringList QtVersion::debuggingHelperLibraryLocations() const
     return DebuggingHelperLibrary::locationsByInstallData(qtInstallData);
 }
 
-bool QtVersion::supportsBinaryDebuggingHelper() const
-{
-    if (!isValid())
-        return false;
-    return qtAbis().at(0).os() != ProjectExplorer::Abi::SymbianOS;
-}
-
 bool QtVersion::hasDocumentation() const
 {
     updateVersionInfo();
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index c4013aabfed..5a647d00f54 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -141,7 +141,6 @@ public:
     void addToEnvironment(Utils::Environment &env) const;
     QList<ProjectExplorer::HeaderPath> systemHeaderPathes() const;
 
-    bool supportsBinaryDebuggingHelper() const;
     QString gdbDebuggingHelperLibrary() const;
     QString qmlDebuggingHelperLibrary(bool debugVersion) const;
     QString qmlDumpTool(bool debugVersion) const;