summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@qt.io>2019-06-05 14:26:29 +0300
committerJanne Koskinen <janne.p.koskinen@qt.io>2019-06-05 14:26:29 +0300
commit61823aaccc6510699a54b34a2fe3f7523dab3b4e (patch)
tree5d249f90264cfb9dff856a20b99822f61c1609c6
parentcf414143caa139d43940da0d36290b1f3e8c52cf (diff)
Fix Integrity build after type changes
Same issue as with Android. long vs. long long. Change-Id: I35dc4e9183332b32afaad53003f434e0d093a52b Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
-rw-r--r--src/Runtime/ogl-runtime/src/foundation/Qt3DSSimpleTypes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Runtime/ogl-runtime/src/foundation/Qt3DSSimpleTypes.h b/src/Runtime/ogl-runtime/src/foundation/Qt3DSSimpleTypes.h
index 92f17245..05ac8d90 100644
--- a/src/Runtime/ogl-runtime/src/foundation/Qt3DSSimpleTypes.h
+++ b/src/Runtime/ogl-runtime/src/foundation/Qt3DSSimpleTypes.h
@@ -54,7 +54,7 @@ typedef quint32 QT3DSU32;
typedef qint32 QT3DSI32;
// Android's definition of GLuint64 as unsigned long (64-bits) requires this workaround
-#if Q_PROCESSOR_WORDSIZE == 8 && defined(Q_OS_ANDROID)
+#if Q_PROCESSOR_WORDSIZE == 8 && (defined(Q_OS_ANDROID) || defined(Q_OS_INTEGRITY))
typedef unsigned long QT3DSU64;
#else
typedef quint64 QT3DSU64;