Revert "Custom targets can set QtVersion to support id and set abis"

This reverts commit 462278b0710316819372571fbcf40c62088302d4 for master.

diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index e92d92d..6bfb61d 100644 (file)
--- 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 f66f208..901b7cb 100644 (file)
--- 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;