summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qprocessordetection.h7
-rw-r--r--src/gui/configure.json1
2 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h
index 566d76d3d2..9fb3473ed3 100644
--- a/src/corelib/global/qprocessordetection.h
+++ b/src/corelib/global/qprocessordetection.h
@@ -107,14 +107,17 @@
# define Q_PROCESSOR_ARM __TARGET_ARCH_ARM
# elif defined(_M_ARM) && _M_ARM > 1
# define Q_PROCESSOR_ARM _M_ARM
-# elif defined(__ARM64_ARCH_8__) || defined(__aarch64__)
+# elif defined(__ARM64_ARCH_8__) \
+ || defined(__aarch64__) \
+ || defined(__CORE_CORTEXAV8__) // GHS-specific for INTEGRITY
# define Q_PROCESSOR_ARM 8
# elif defined(__ARM_ARCH_7__) \
|| defined(__ARM_ARCH_7A__) \
|| defined(__ARM_ARCH_7R__) \
|| defined(__ARM_ARCH_7M__) \
|| defined(__ARM_ARCH_7S__) \
- || defined(_ARM_ARCH_7)
+ || defined(_ARM_ARCH_7) \
+ || defined(__CORE_CORTEXA__) // GHS-specific for INTEGRITY
# define Q_PROCESSOR_ARM 7
# elif defined(__ARM_ARCH_6__) \
|| defined(__ARM_ARCH_6J__) \
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 7efaaff505..f862b5866c 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -1098,6 +1098,7 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla
},
"linuxfb", "mirclient",
{
+ "type": "feature",
"message": "INTEGRITY framebuffer",
"condition": "config.integrity",
"args": "integrityfb"