mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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>
This commit is contained in:
parent
ee11e1540e
commit
44f872cc59
1 changed files with 2 additions and 0 deletions
|
|
@ -45,6 +45,7 @@
|
||||||
|
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
|
|
||||||
|
#if QT_VERSION < 0x050000
|
||||||
#if defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM) || defined(__arm64__)
|
#if defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM) || defined(__arm64__)
|
||||||
# define Q_PROCESSOR_ARM
|
# define Q_PROCESSOR_ARM
|
||||||
# if defined(__arm64__)
|
# if defined(__arm64__)
|
||||||
|
|
@ -197,6 +198,7 @@
|
||||||
# define Q_PROCESSOR_WORDSIZE QT_POINTER_SIZE
|
# define Q_PROCESSOR_WORDSIZE QT_POINTER_SIZE
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
#endif // Qt < 5.0.0
|
||||||
|
|
||||||
class QString;
|
class QString;
|
||||||
class SubsurfaceSysInfo {
|
class SubsurfaceSysInfo {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue