diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-22 16:35:41 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-22 16:35:43 +0200 |
| commit | 4c231d5df3040dbf4545a9a77145ee0e1f9c380c (patch) | |
| tree | 2cc5b71a5d2b464214cf5372776913fbe4622e1e /src/corelib/global/qprocessordetection.h | |
| parent | 7df16fb4ccbe0476bc34274a77e98eec4e8d2d93 (diff) | |
| parent | d672ef07681a959d9559dd1e11e70db1f448a7f1 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I059725e3b7d7ffd5a16a0931e6c17200917172b5
Diffstat (limited to 'src/corelib/global/qprocessordetection.h')
| -rw-r--r-- | src/corelib/global/qprocessordetection.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h index 178afb1db6..21f9c8f44f 100644 --- a/src/corelib/global/qprocessordetection.h +++ b/src/corelib/global/qprocessordetection.h @@ -101,6 +101,8 @@ || defined(__ARM_ARCH_7A__) \ || defined(__ARM_ARCH_7R__) \ || defined(__ARM_ARCH_7M__) \ + || defined(__ARM_ARCH_7S__) \ + || defined(_ARM_ARCH_7) \ || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 7) \ || (defined(_M_ARM) && _M_ARM-0 >= 7) # define Q_PROCESSOR_ARM_V7 |