diff options
| -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) |