summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qstring.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-06-05 10:52:02 -0700
committerThiago Macieira <thiago.macieira@intel.com>2017-06-07 15:54:14 +0000
commit6ae801875ea3c654f808b7ed519b403807653068 (patch)
tree5dd5369c9e920e6c0a4958cd1e0a4784dcbc3578 /src/corelib/tools/qstring.h
parentbc93ee060abcd746cbed906a51f2379e3da6f379 (diff)
Re-fix the detection of CPU architecture on an Apple OS
Commit d56c6cf7a4fe2b7e5543d58a786efc768b7370c2 was incorrect. It was a nice try, but on a 64-bit Mac machine (x86_64 CPU), it returned hw.cputype = 7, which is CPU_TYPE_X86. CPU_TYPE_X86_64 is only used in Mach-O slices for fat binaries and does not reflect hw.cputype. Task-number: QTBUG-61205 Change-Id: Ia3e896da908f42939148fffd14c54b3050b8e64b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/corelib/tools/qstring.h')
0 files changed, 0 insertions, 0 deletions