Use the Q_PROCESSOR_* macros in qsimd.cpp

Change-Id: I7be9b14a24329be32c43603ae87df17328696109
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>

diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp
index cd480f0..75d9f77 100644 (file)
--- a/src/corelib/tools/qsimd.cpp
+++ b/src/corelib/tools/qsimd.cpp
@@ -101,7 +101,7 @@ static inline uint detectProcessorFeatures()
     return features;
 }
 
-#elif defined(__arm__) || defined(__arm) || defined(QT_HAVE_IWMMXT) || defined(QT_HAVE_NEON)
+#elif defined(Q_PROCESSOR_ARM) || defined(QT_HAVE_IWMMXT) || defined(QT_HAVE_NEON)
 static inline uint detectProcessorFeatures()
 {
     uint features = 0;
@@ -145,7 +145,7 @@ static inline uint detectProcessorFeatures()
     return features;
 }
 
-#elif defined(__i386__) || defined(_M_IX86)
+#elif defined(Q_PROCESSOR_X86_32)
 static inline uint detectProcessorFeatures()
 {
     uint features = 0;
@@ -270,7 +270,7 @@ static inline uint detectProcessorFeatures()
     return features;
 }
 
-#elif defined(__x86_64) || defined(Q_OS_WIN64)
+#elif defined(Q_PROCESSOR_X86_64) || defined(Q_OS_WIN64)
 static inline uint detectProcessorFeatures()
 {
     uint features = SSE2;