path: root/src/corelib
diff options
authorEskil Abrahamsen Blomfeldt <>2013-04-30 13:05:28 +0200
committerThe Qt Project <>2013-05-07 22:43:14 +0200
commit9fa1bdeeb2bca6f9ba370fce594a47a066a7e81a (patch)
treed3fbac6c2c9157b178356d1a8efd02e23916b5c0 /src/corelib
parent3483336889444ff66f2bc5dbdee36411ccf3bdb5 (diff)
Fix compilation for Android ARMv5
We have to use the 4.4.3 compiler toolchain for producing binaries for ARMv5 on Android, since the 4.7 toolchain has a regression for this architecture. The regression has been fixed, but the fix has not been released yet, so until it has, we need to use the 4.4.3. However, the 4.4.3 toolchain has a different bug, which breaks compilation in qtimageformats with a message about redefinition of uint. This works around that bug for Android builds. When the patched compiler has been released, we can revert this. Task-number: QTBUG-30921 Change-Id: I620c186c6e932413a4de1dd331fbf4b9401f2e72 Reviewed-by: Paul Olav Tvete <>
Diffstat (limited to 'src/corelib')
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 58c4256aa5..79e32fe793 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -203,7 +203,11 @@ typedef quint64 qulonglong;
typedef unsigned char uchar;
typedef unsigned short ushort;
+#if defined(Q_QDOC) || !defined(Q_OS_ANDROID)
typedef unsigned int uint;
+# include <sys/types.h>
typedef unsigned long ulong;