aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/tools
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2014-03-02 02:34:31 -0500
committerJoerg Bornemann <joerg.bornemann@digia.com>2014-03-03 10:49:20 +0100
commit87f344c6ee8612ccffbbc72c07b13bd01e9a252b (patch)
treef47d7b11a74be196cf555e57a6493c61197d911a /src/lib/corelib/tools
parentfe62d72dd45b6560ae16bae122401bf6342ee9cc (diff)
Canonicalize more architectures.
Change-Id: Ib792d1d933fee0cfaf1a968517946b407b8072e2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/corelib/tools')
-rw-r--r--src/lib/corelib/tools/hostosinfo.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/corelib/tools/hostosinfo.h b/src/lib/corelib/tools/hostosinfo.h
index 0bf05cbfd..5495e8619 100644
--- a/src/lib/corelib/tools/hostosinfo.h
+++ b/src/lib/corelib/tools/hostosinfo.h
@@ -143,7 +143,8 @@ QString HostOsInfo::canonicalArchitecture(const QString &architecture)
<< QLatin1String("ia-32")
<< QLatin1String("x86_32")
<< QLatin1String("x86-32")
- << QLatin1String("intel32"));
+ << QLatin1String("intel32")
+ << QLatin1String("mingw32"));
archMap.insert(QLatin1String("x86_64"), QStringList()
<< QLatin1String("x86-64")
@@ -151,12 +152,19 @@ QString HostOsInfo::canonicalArchitecture(const QString &architecture)
<< QLatin1String("amd64")
<< QLatin1String("ia32e")
<< QLatin1String("em64t")
- << QLatin1String("intel64"));
+ << QLatin1String("intel64")
+ << QLatin1String("mingw64"));
archMap.insert(QLatin1String("ia64"), QStringList()
<< QLatin1String("ia-64")
<< QLatin1String("itanium"));
+ archMap.insert(QLatin1String("ppc"), QStringList()
+ << QLatin1String("powerpc"));
+
+ archMap.insert(QLatin1String("ppc64"), QStringList()
+ << QLatin1String("powerpc64"));
+
QMapIterator<QString, QStringList> i(archMap);
while (i.hasNext()) {
i.next();