diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index 219a6f47f37446f74b81f7bc23025f577679f5d8..aafe96ccd95b7b59f60c039aeec1fd319b5215f2 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::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 473918b9185f3ecee1414e515b15040cf8b62d8c..e7e7a9669eabcfafa165733666bd8b1d4662a6d6 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 7253684966432764ffa7e0a9fd742ddb0e4f8b74..3f79461f3cd2ff15beede85217f1222f2b390e1d 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 5331ece97292777abd2bb5d393b0aa2e3423bf39..0980c48982a7d84ff69a855911ae0d6155450f29 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 ced6d1defedef2ff4b830633cb3e0976c0e907ee..7e08dc3493f39195f8abbf65781773e6bf095c4c 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.");