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

Merge remote-tracking branch 'origin/4.5' into 4.6

Browse Source 
Conflicts:
	src/shared/qbs

Change-Id: Ib734825a302efe41021307d7d64eb7b453262dc4
This commit is contained in:
Eike Ziller
2018-01-25 10:16:46 +01:00
parent e54c514984 ba859279c3
commit 0df84b45e5
10 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,27 @@ namespace ProjectExplorer {
// Helpers
// --------------------------------------------------------------------------
static Abi::Architecture architectureFromQt()
{
const QString arch = QSysInfo::buildCpuArchitecture();
if (arch.startsWith("arm"))
return Abi::ArmArchitecture;
if (arch.startsWith("x86") || arch == "i386")
return Abi::X86Architecture;
if (arch == "ia64")
return Abi::ItaniumArchitecture;
if (arch.startsWith("mips"))
return Abi::MipsArchitecture;
if (arch.startsWith("power"))
return Abi::PowerPCArchitecture;
if (arch.startsWith("sh")) // Not in Qt documentation!
return Abi::ShArchitecture;
if (arch.startsWith("avr")) // Not in Qt documentation!
return Abi::AvrArchitecture;
return Abi::UnknownArchitecture;
}
static quint8 getUint8(const QByteArray &data, int pos)
{
return static_cast<quint8>(data.at(pos));
@@ -840,7 +861,7 @@ Abi::OSFlavor Abi::flavorForMsvcVersion(int version)
Abi Abi::hostAbi()
{
Architecture arch = QTC_CPU; // define set by qmake
Architecture arch = architectureFromQt();
OS os = UnknownOS;
OSFlavor subos = UnknownFlavor;
BinaryFormat format = UnknownFormat;