From 8766b88de6da7926c4106fcc5222f48cf5db6a86 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 22 Jun 2011 12:18:19 +0200
Subject: [PATCH] Revert "Custom targets can set QtVersion to support id and
 set abis"

This reverts commit 462278b0710316819372571fbcf40c62088302d4 for master.
---
 src/plugins/qt4projectmanager/qtversionmanager.cpp | 18 ------------------
 src/plugins/qt4projectmanager/qtversionmanager.h   |  5 -----
 2 files changed, 23 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index e92d92d22e..6bfb61d952 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1413,39 +1413,21 @@ QString QtVersion::systemRoot() const
 bool QtVersion::supportsTargetId(const QString &id) const
 {
     updateAbiAndMkspec();
-    if (!m_forcedTargetIds.isEmpty())
-        return m_forcedTargetIds.contains(id);
     return m_targetIds.contains(id);
 }
 
 QSet<QString> QtVersion::supportedTargetIds() const
 {
     updateAbiAndMkspec();
-    if (!m_forcedTargetIds.isEmpty())
-        return m_forcedTargetIds;
     return m_targetIds;
 }
 
 QList<ProjectExplorer::Abi> QtVersion::qtAbis() const
 {
     updateAbiAndMkspec();
-    if (!m_forcedAbis.isEmpty())
-        return m_forcedAbis;
     return m_abis;
 }
 
-void QtVersion::setForcedTargetIds(const QSet<QString> &ids)
-{
-    updateAbiAndMkspec();
-    m_forcedTargetIds = ids;
-}
-
-void QtVersion::setForcedQtAbis(const QList<ProjectExplorer::Abi> &abis)
-{
-    updateAbiAndMkspec();
-    m_forcedAbis = abis;
-}
-
 // if none, then it's INVALID everywhere this function is called
 void QtVersion::updateAbiAndMkspec() const
 {
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index f66f208b15..901b7cb9b6 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -118,9 +118,6 @@ public:
 
     QList<ProjectExplorer::Abi> qtAbis() const;
 
-    void setForcedTargetIds(const QSet<QString> &ids);
-    void setForcedQtAbis(const QList<ProjectExplorer::Abi> &abis);
-
     /// @returns the name of the mkspec, which is generally not enough
     /// to pass to qmake.
     QString mkspec() const;
@@ -224,7 +221,6 @@ private:
     mutable QString m_mkspec; // updated lazily
     mutable QString m_mkspecFullPath;
     mutable QList<ProjectExplorer::Abi> m_abis;
-    mutable QList<ProjectExplorer::Abi> m_forcedAbis;
 
     mutable bool m_versionInfoUpToDate;
     mutable QHash<QString,QString> m_versionInfo; // updated lazily
@@ -242,7 +238,6 @@ private:
     mutable QString m_linguistCommand;
     mutable QString m_qmlviewerCommand;
     mutable QSet<QString> m_targetIds;
-    mutable QSet<QString> m_forcedTargetIds;
 
     mutable bool m_isBuildUsingSbsV2;
     mutable bool m_qmakeIsExecutable;
-- 
2.11.0