From 44f872cc5996a50e9dec5e5321f9609d9b70d0bc Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago@macieira.org>
Date: Sun, 15 Jun 2014 13:57:21 -0700
Subject: Disable the Q_PROCESSOR_xxx macros in Qt 5.0

We don't want to redefine, we just need what Qt 5 already has.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 subsurfacesysinfo.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/subsurfacesysinfo.h b/subsurfacesysinfo.h
index ef5a29862..896ff5899 100644
--- a/subsurfacesysinfo.h
+++ b/subsurfacesysinfo.h
@@ -45,6 +45,7 @@
 
 #include <QtGlobal>
 
+#if QT_VERSION < 0x050000
 #if defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM) || defined(__arm64__)
 #	define Q_PROCESSOR_ARM
 #	if defined(__arm64__)
@@ -197,6 +198,7 @@
 #		define Q_PROCESSOR_WORDSIZE        QT_POINTER_SIZE
 #	endif
 #endif
+#endif // Qt < 5.0.0
 
 class QString;
 class SubsurfaceSysInfo {
-- 
cgit v1.2.3-70-g09d2