summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-07-07 14:07:10 -0700
committerThiago Macieira <thiago.macieira@intel.com>2014-07-31 03:23:16 +0200
commit2ef10d8473e23e5b999cf0067db4f2dad8d49419 (patch)
treecbc2f7276649841e77dfe892c80b8feeb874c6f0 /src/corelib/global/qglobal.cpp
parentb5d5d063532934cc018930211ded64313e72d39a (diff)
Doc: update the list of typical values for xxxCpuArchitecture
If we wanted to make the list exhaustive for buildCpuArchitecture, we'd add alpha, avr32, bfin, s390(x), and sh. I don't want to make it exhaustive because that's cluttering the documentation and we'd have to keep in sync with archdetect.cpp. And we can't make currentCpuArchitecture exhaustive, since it depends on the output from uname(2). You can argue that neither IA-64, POWER, nor SPARC architectures are typical these days... Change-Id: I0a5310770947263e1bafd9443ea59420813c51a8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
-rw-r--r--src/corelib/global/qglobal.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 572ee51448..a0c943df62 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2154,11 +2154,16 @@ static bool readEtcOsRelease(QUnixOSVersion &v)
Typical returned values are (note: list not exhaustive):
\list
\li "arm"
+ \li "arm64"
\li "i386"
+ \li "ia64"
\li "mips"
- \li "x86_64"
+ \li "mips64"
\li "power"
+ \li "power64"
\li "sparc"
+ \li "sparcv9"
+ \li "x86_64"
\endlist
\sa QSysInfo::buildAbi(), QSysInfo::currentCpuArchitecture()
@@ -2186,11 +2191,16 @@ QString QSysInfo::buildCpuArchitecture()
Typical returned values are (note: list not exhaustive):
\list
\li "arm"
+ \li "arm64"
\li "i386"
+ \li "ia64"
\li "mips"
- \li "x86_64"
+ \li "mips64"
\li "power"
+ \li "power64"
\li "sparc"
+ \li "sparcv9"
+ \li "x86_64"
\endlist
\sa QSysInfo::buildAbi(), QSysInfo::buildCpuArchitecture()