feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Abi: Remove traces of harmhattan and maemo support

Browse Source 
Change-Id: Ibacaf76e39e98c9d37d56e0bdedbbae07702e979
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2013-10-24 13:34:41 +02:00
committed by Tobias Hunger
parent 5ef35e4125
commit a4aa2bc29b
5 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/abi.cpp
View File

@@ -311,7 +311,7 @@ Abi::Abi(const Architecture &a, const OS &o,
m_osFlavor = UnknownFlavor; m_osFlavor = UnknownFlavor;
break; break;
case ProjectExplorer::Abi::LinuxOS: case ProjectExplorer::Abi::LinuxOS:
if (m_osFlavor < GenericLinuxFlavor || m_osFlavor > MaemoLinuxFlavor) if (m_osFlavor < GenericLinuxFlavor || m_osFlavor > AndroidLinuxFlavor)
m_osFlavor = UnknownFlavor; m_osFlavor = UnknownFlavor;
break; break;
case ProjectExplorer::Abi::BsdOS: case ProjectExplorer::Abi::BsdOS:
@@ -388,10 +388,6 @@ Abi::Abi(const QString &abiString) :
m_osFlavor = NetBsdFlavor; m_osFlavor = NetBsdFlavor;
else if (abiParts.at(2) == QLatin1String("openbsd") && m_os == BsdOS) else if (abiParts.at(2) == QLatin1String("openbsd") && m_os == BsdOS)
m_osFlavor = OpenBsdFlavor; 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) else if (abiParts.at(2) == QLatin1String("generic") && m_os == MacOS)
m_osFlavor = GenericMacFlavor; m_osFlavor = GenericMacFlavor;
else if (abiParts.at(2) == QLatin1String("generic") && m_os == UnixOS) else if (abiParts.at(2) == QLatin1String("generic") && m_os == UnixOS)
@@ -638,10 +634,6 @@ QString Abi::toString(const OSFlavor &of)
return QLatin1String("netbsd"); return QLatin1String("netbsd");
case ProjectExplorer::Abi::OpenBsdFlavor: case ProjectExplorer::Abi::OpenBsdFlavor:
return QLatin1String("openbsd"); return QLatin1String("openbsd");
case ProjectExplorer::Abi::MaemoLinuxFlavor:
return QLatin1String("maemo");
case ProjectExplorer::Abi::HarmattanLinuxFlavor:
return QLatin1String("harmattan");
case ProjectExplorer::Abi::GenericMacFlavor: case ProjectExplorer::Abi::GenericMacFlavor:
return QLatin1String("generic"); return QLatin1String("generic");
case ProjectExplorer::Abi::GenericUnixFlavor: case ProjectExplorer::Abi::GenericUnixFlavor:
@@ -699,8 +691,7 @@ QList<Abi::OSFlavor> Abi::flavorsForOs(const Abi::OS &o)
case BsdOS: case BsdOS:
return result << FreeBsdFlavor << OpenBsdFlavor << NetBsdFlavor << UnknownFlavor; return result << FreeBsdFlavor << OpenBsdFlavor << NetBsdFlavor << UnknownFlavor;
case LinuxOS: case LinuxOS:
return result << GenericLinuxFlavor << HarmattanLinuxFlavor << MaemoLinuxFlavor return result << GenericLinuxFlavor << AndroidLinuxFlavor << UnknownFlavor;
<< AndroidLinuxFlavor << UnknownFlavor;
case MacOS: case MacOS:
return result << GenericMacFlavor << UnknownFlavor; return result << GenericMacFlavor << UnknownFlavor;
case UnixOS: case UnixOS:

2
src/plugins/projectexplorer/abi.h
View File

@@ -73,8 +73,6 @@ public:
// Linux // Linux
GenericLinuxFlavor, GenericLinuxFlavor,
AndroidLinuxFlavor, AndroidLinuxFlavor,
HarmattanLinuxFlavor,
MaemoLinuxFlavor,
// Mac // Mac
GenericMacFlavor, GenericMacFlavor,

1
src/plugins/qt4projectmanager/librarydetailscontroller.cpp
View File

@@ -103,7 +103,6 @@ LibraryDetailsController::LibraryDetailsController(
} }
} }
} }
setPlatformsVisible(true); setPlatformsVisible(true);
setLinkageGroupVisible(true); setLinkageGroupVisible(true);
setMacLibraryGroupVisible(true); setMacLibraryGroupVisible(true);

5
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -166,11 +166,6 @@ QStringList QMakeStep::deducedArguments()
ProjectExplorer::Abi targetAbi; ProjectExplorer::Abi targetAbi;
if (tc) if (tc)
targetAbi = tc->targetAbi(); 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 // explicitly add architecture to CONFIG
if ((targetAbi.os() == ProjectExplorer::Abi::MacOS) if ((targetAbi.os() == ProjectExplorer::Abi::MacOS)

10
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -1475,16 +1475,6 @@ bool BaseQtVersion::isQmlDebuggingSupported(QString *reason) const
if (!needsQmlDebuggingLibrary() || hasQmlDebuggingLibrary()) if (!needsQmlDebuggingLibrary() || hasQmlDebuggingLibrary())
return true; 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 (!isValid()) {
if (reason) if (reason)
*reason = QCoreApplication::translate("BaseQtVersion", "Invalid Qt version."); *reason = QCoreApplication::translate("BaseQtVersion", "Invalid Qt version.");