From 9fa1bdeeb2bca6f9ba370fce594a47a066a7e81a Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 30 Apr 2013 13:05:28 +0200 Subject: 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 --- src/corelib/global/qglobal.h | 4 ++++ 1 file changed, 4 insertions(+) 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; QT_BEGIN_INCLUDE_NAMESPACE typedef unsigned char uchar; typedef unsigned short ushort; +#if defined(Q_QDOC) || !defined(Q_OS_ANDROID) typedef unsigned int uint; +#else +# include +#endif typedef unsigned long ulong; QT_END_INCLUDE_NAMESPACE -- cgit v1.2.3