[PATCH 2/3] Disable the Q_PROCESSOR_xxx macros in Qt 5.0
Thiago Macieira
thiago at macieira.org
Sun Jun 15 13:57:21 PDT 2014
We don't want to redefine, we just need what Qt 5 already has.
Signed-off-by: Thiago Macieira <thiago at macieira.org>
---
subsurfacesysinfo.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/subsurfacesysinfo.h b/subsurfacesysinfo.h
index ef5a298..896ff58 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 {
--
1.8.4.5
More information about the subsurface
mailing list