diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2013-10-24 13:34:41 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-10-25 13:57:21 +0200 |
| commit | a4aa2bc29b0d945984b1dc8564985010dbf881e8 (patch) | |
| tree | fff30619f10ba755ece6b1c51a221fea80e40529 /src/plugins/projectexplorer/abi.cpp | |
| parent | 5ef35e4125635f2be72d0873e22e2e44a2394d9b (diff) | |
| download | qt-creator-a4aa2bc29b0d945984b1dc8564985010dbf881e8.tar.gz | |
Abi: Remove traces of harmhattan and maemo support
Change-Id: Ibacaf76e39e98c9d37d56e0bdedbbae07702e979
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/projectexplorer/abi.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/abi.cpp | 13 |
1 files changed, 2 insertions, 11 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: |