diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2014-06-15 13:57:21 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-06-18 04:54:25 -0700 |
| commit | 44f872cc5996a50e9dec5e5321f9609d9b70d0bc (patch) | |
| tree | efb4b42ec77a61f7dd9234dc5a7aaaeaa4c72de9 /subsurfacesysinfo.h | |
| parent | ee11e1540e888467e95ee4fc930f276ed7804c4e (diff) | |
| download | subsurface-44f872cc5996a50e9dec5e5321f9609d9b70d0bc.tar.gz | |
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>
Diffstat (limited to 'subsurfacesysinfo.h')
| -rw-r--r-- | subsurfacesysinfo.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 { |