diff options
| author | Robin Burchell <robin.burchell@collabora.co.uk> | 2012-05-02 13:31:48 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 15:24:52 +0200 |
| commit | 06887461548bebcb7aa47f5cb06d421d8fd40944 (patch) | |
| tree | ebdf89b342e0b5eefcb46f3c6bb179ad8e0e47f5 | |
| parent | 72c5ca98e539daab86542e53ce8404776d03a63f (diff) | |
Add Android to conditionals around langinfo.h usage.
Despite being mandated by POSIX, Android does not support this.
Change-Id: I3da42ff9b3336cb6657692a9eb70dd3118ac1756
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index b7939f1f3e..916aefab26 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -82,8 +82,9 @@ #include <stdlib.h> #include <ctype.h> #include <locale.h> -#if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) -#include <langinfo.h> +#if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX) && \ + !defined(Q_OS_OSF) && !defined(Q_OS_LINUX_ANDROID) +# include <langinfo.h> #endif #ifdef Q_OS_WIN @@ -534,7 +535,8 @@ static void setupLocaleMapper() localeMapper = QTextCodec::codecForName("System"); #endif -#if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) +#if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX) && \ + !defined(Q_OS_OSF) && !defined(Q_OS_LINUX_ANDROID) if (!localeMapper) { char *charset = nl_langinfo (CODESET); if (charset) |