Revert "Fix compilation for Android ARMv5"
This reverts commit 9fa1bdeeb2 which
is no longer needed because the Android NDK now contains a
toolchain without the bug for which it was a work-around.
Task-number: QTBUG-31051
Change-Id: I601ba2fccb927ee7e818644de4474700e2eec8f1
Reviewed-by: BogDan Vatra <bogdan@kde.org>
bb10
parent
ac611399fe
commit
f3a53eae80
|
|
@ -203,11 +203,7 @@ 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 <sys/types.h>
|
||||
#endif
|
||||
typedef unsigned long ulong;
|
||||
QT_END_INCLUDE_NAMESPACE
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue