diff options
| -rw-r--r-- | src/corelib/tools/qcryptographichash.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qdrawhelper_p.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp index 42877ec664..1c74a602c6 100644 --- a/src/corelib/tools/qcryptographichash.cpp +++ b/src/corelib/tools/qcryptographichash.cpp @@ -65,7 +65,7 @@ typedef HashReturn (SHA3Init)(hashState *state, int hashbitlen); typedef HashReturn (SHA3Update)(hashState *state, const BitSequence *data, DataLength databitlen); typedef HashReturn (SHA3Final)(hashState *state, BitSequence *hashval); -#if QT_POINTER_SIZE == 8 // 64 bit version +#if Q_PROCESSOR_WORDSIZE == 8 // 64 bit version #include "../../3rdparty/sha3/KeccakF-1600-opt64.c" diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h index 2fb9e7760c..1d70477051 100644 --- a/src/gui/painting/qdrawhelper_p.h +++ b/src/gui/painting/qdrawhelper_p.h @@ -588,7 +588,7 @@ static Q_ALWAYS_INLINE uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b return x; } -#if QT_POINTER_SIZE == 8 // 64-bit versions +#if Q_PROCESSOR_WORDSIZE == 8 // 64-bit versions static Q_ALWAYS_INLINE uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) { quint64 t = (((quint64(x)) | ((quint64(x)) << 24)) & 0x00ff00ff00ff00ff) * a; @@ -1093,7 +1093,7 @@ const uint qt_bayer_matrix[16][16] = { ((((argb >> 24) * alpha) >> 8) << 24) | (argb & 0x00ffffff) -#if QT_POINTER_SIZE == 8 // 64-bit versions +#if Q_PROCESSOR_WORDSIZE == 8 // 64-bit versions #define AMIX(mask) (qMin(((qint64(s)&mask) + (qint64(d)&mask)), qint64(mask))) #define MIX(mask) (qMin(((qint64(s)&mask) + (qint64(d)&mask)), qint64(mask))) #else // 32 bits |