diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2014-03-06 12:58:21 -0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-09 19:39:44 +0200 |
commit | 1ec8df439a1b3d82c6f4d443c22fc9bb00566d1e (patch) | |
tree | 155d6d4e02ade75bbaa1ffaf1914c9d6dbde126e /src/corelib/global/qsysinfo.h | |
parent | 0b5c0ad2ef49a262de5bdb18a3cdab30ae6772a2 (diff) |
Add QSysInfo::cpuArchitecture() and fullCpuArchitecture()
This uses the same logic as the config.test, so we will return the same
string as the $$QT_ARCH variable in qmake for cpuArchitecture().
fullCpuArchitecture() is meant to be used in upgrade mechanisms, when
combined with the OS type.
Change-Id: If0dfee9eff75a07fa4c0778d204e0e768bf43074
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/corelib/global/qsysinfo.h')
-rw-r--r-- | src/corelib/global/qsysinfo.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h index 38735c12de..fe78df4abb 100644 --- a/src/corelib/global/qsysinfo.h +++ b/src/corelib/global/qsysinfo.h @@ -162,6 +162,9 @@ public: static const MacVersion MacintoshVersion; static MacVersion macVersion(); #endif + + static QString cpuArchitecture(); + static QString fullCpuArchitecture(); }; QT_END_NAMESPACE |