AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Android to conditionals around langinfo.h usage.

Browse Source 
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>
This commit is contained in:
Robin Burchell 2012-05-02 13:31:48 +02:00 committed by Qt by Nokia
parent 72c5ca98e5
commit 0688746154
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/codecs/qtextcodec.cpp
View File

@ -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)