diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-08-27 11:52:56 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-27 16:00:47 +0200 |
| commit | f3a53eae80bda8bb9364e5caa6b0e1cf0dd9ce87 (patch) | |
| tree | 0eb8dc3837dda28c633b624d150779e2dcd5b5fa /src/corelib | |
| parent | ac611399fe1f059b00b3939b78b8ef1666102e68 (diff) | |
Revert "Fix compilation for Android ARMv5"
This reverts commit 9fa1bdeeb2bca6f9ba370fce594a47a066a7e81a 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>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index cde3e96ed1..a70dc52e9f 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -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 |