Abi: Remove traces of harmhattan and maemo support

Change-Id: Ibacaf76e39e98c9d37d56e0bdedbbae07702e979
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

5 files changed, 2 insertions, 29 deletions

diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
index 219a6f47f3..aafe96ccd9 100644
--- a/src/plugins/projectexplorer/abi.cpp
+++ b/src/plugins/projectexplorer/abi.cpp
@@ -311,7 +311,7 @@ Abi::Abi(const Architecture &a, const OS &o,
         m_osFlavor = UnknownFlavor;
         break;
     case ProjectExplorer::Abi::LinuxOS:
-        if (m_osFlavor < GenericLinuxFlavor || m_osFlavor > MaemoLinuxFlavor)
+        if (m_osFlavor < GenericLinuxFlavor || m_osFlavor > AndroidLinuxFlavor)
             m_osFlavor = UnknownFlavor;
         break;
     case ProjectExplorer::Abi::BsdOS:
@@ -388,10 +388,6 @@ Abi::Abi(const QString &abiString) :
             m_osFlavor = NetBsdFlavor;
         else if (abiParts.at(2) == QLatin1String("openbsd") && m_os == BsdOS)
             m_osFlavor = OpenBsdFlavor;
-        else if (abiParts.at(2) == QLatin1String("maemo") && m_os == LinuxOS)
-            m_osFlavor = MaemoLinuxFlavor;
-        else if (abiParts.at(2) == QLatin1String("harmattan") && m_os == LinuxOS)
-            m_osFlavor = HarmattanLinuxFlavor;
         else if (abiParts.at(2) == QLatin1String("generic") && m_os == MacOS)
             m_osFlavor = GenericMacFlavor;
         else if (abiParts.at(2) == QLatin1String("generic") && m_os == UnixOS)
@@ -638,10 +634,6 @@ QString Abi::toString(const OSFlavor &of)
         return QLatin1String("netbsd");
     case ProjectExplorer::Abi::OpenBsdFlavor:
         return QLatin1String("openbsd");
-    case ProjectExplorer::Abi::MaemoLinuxFlavor:
-        return QLatin1String("maemo");
-    case ProjectExplorer::Abi::HarmattanLinuxFlavor:
-        return QLatin1String("harmattan");
     case ProjectExplorer::Abi::GenericMacFlavor:
         return QLatin1String("generic");
     case ProjectExplorer::Abi::GenericUnixFlavor:
@@ -699,8 +691,7 @@ QList<Abi::OSFlavor> Abi::flavorsForOs(const Abi::OS &o)
     case BsdOS:
         return result << FreeBsdFlavor << OpenBsdFlavor << NetBsdFlavor << UnknownFlavor;
     case LinuxOS:
-        return result << GenericLinuxFlavor << HarmattanLinuxFlavor << MaemoLinuxFlavor
-                      << AndroidLinuxFlavor << UnknownFlavor;
+        return result << GenericLinuxFlavor << AndroidLinuxFlavor << UnknownFlavor;
     case MacOS:
         return result << GenericMacFlavor << UnknownFlavor;
     case UnixOS:
diff --git a/src/plugins/projectexplorer/abi.h b/src/plugins/projectexplorer/abi.h
index 473918b918..e7e7a9669e 100644
--- a/src/plugins/projectexplorer/abi.h
+++ b/src/plugins/projectexplorer/abi.h
@@ -73,8 +73,6 @@ public:
         // Linux
         GenericLinuxFlavor,
         AndroidLinuxFlavor,
-        HarmattanLinuxFlavor,
-        MaemoLinuxFlavor,
 
         // Mac
         GenericMacFlavor,
diff --git a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
index 7253684966..3f79461f3c 100644
--- a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
+++ b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
@@ -103,7 +103,6 @@ LibraryDetailsController::LibraryDetailsController(
             }
         }
     }
-
     setPlatformsVisible(true);
     setLinkageGroupVisible(true);
     setMacLibraryGroupVisible(true);
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index 5331ece972..0980c48982 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -166,11 +166,6 @@ QStringList QMakeStep::deducedArguments()
     ProjectExplorer::Abi targetAbi;
     if (tc)
         targetAbi = tc->targetAbi();
-    if ((HostOsInfo::isWindowsHost() || HostOsInfo::isMacHost())
-            && (targetAbi.osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavor
-                || targetAbi.osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor)) {
-        arguments << QLatin1String("-unix");
-    }
 
     // explicitly add architecture to CONFIG
     if ((targetAbi.os() == ProjectExplorer::Abi::MacOS)
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index ced6d1defe..7e08dc3493 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -1475,16 +1475,6 @@ bool BaseQtVersion::isQmlDebuggingSupported(QString *reason) const
     if (!needsQmlDebuggingLibrary() || hasQmlDebuggingLibrary())
         return true;
 
-    if (!qtAbis().isEmpty()) {
-        Abi abi = qtAbis().first();
-        if (abi.osFlavor() == Abi::MaemoLinuxFlavor) {
-            if (reason)
-                reason->clear();
-                // *reason = QCoreApplication::translate("BaseQtVersion", "Qml debugging on device not yet supported.");
-            return false;
-        }
-    }
-
     if (!isValid()) {
         if (reason)
             *reason = QCoreApplication::translate("BaseQtVersion", "Invalid Qt version.");