From e6b8d742a71ce5703d29cb278e311b7a66b4e4da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?=
 <tor.arne.vestbo@theqtcompany.com>
Date: Mon, 29 Feb 2016 14:36:38 +0100
Subject: Fix detectProcessorFeatures() fallback path on ARM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ifcad547caf2d2a7ad7aa1ccb4fbed08810905cee
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
---
 src/corelib/tools/qsimd.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/corelib')

diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp
index f2caaaa538..88208d0c9d 100644
--- a/src/corelib/tools/qsimd.cpp
+++ b/src/corelib/tools/qsimd.cpp
@@ -167,10 +167,10 @@ static inline quint64 detectProcessorFeatures()
 #endif
 
 #if defined(__ARM_NEON__)
-    features = Q_UINT64_C(1) << CpuFeatureNEON;
+    features |= Q_UINT64_C(1) << CpuFeatureNEON;
 #endif
 #if defined(__ARM_FEATURE_CRC32)
-    features = Q_UINT64_C(1) << CpuFeatureCRC32;
+    features |= Q_UINT64_C(1) << CpuFeatureCRC32;
 #endif
 
     return features;
-- 
cgit v1.2.3