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

Disable iconv on utf-8 based platforms

Browse Source 
There's no need to use iconv on Mac,
iOS, Android or QNX, as all these
platforms are fully utf-8 based.

Change-Id: I2a03c8dea72ad91f6ec83da0a838de20e46babef
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Lars Knoll 2012-07-20 21:22:47 +02:00 committed by Qt by Nokia
parent 46e3aa2908
commit 39bdbc2cb5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/codecs/codecs.pri
View File

@ -30,21 +30,22 @@ SOURCES += \
codecs/qeuckrcodec.cpp \
codecs/qbig5codec.cpp
unix {
unix:!qnx:!mac:!ios:!linux-android-* {
contains(QT_CONFIG,iconv) {
HEADERS += codecs/qiconvcodec_p.h
SOURCES += codecs/qiconvcodec.cpp
qnx:LIBS_PRIVATE *= -liconv
} else:contains(QT_CONFIG,gnu-libiconv) {
HEADERS += codecs/qiconvcodec_p.h
SOURCES += codecs/qiconvcodec.cpp
DEFINES += GNU_LIBICONV
!mac:LIBS_PRIVATE *= -liconv
LIBS_PRIVATE *= -liconv
} else:contains(QT_CONFIG,sun-libiconv) {
HEADERS += codecs/qiconvcodec_p.h
SOURCES += codecs/qiconvcodec.cpp
DEFINES += GNU_LIBICONV
}
} else {
DEFINES += QT_NO_ICONV
}
win32 {
SOURCES += codecs/qwindowscodec.cpp

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

@ -55,7 +55,7 @@
#include "private/qcoreglobaldata_p.h"
#if !defined(QT_BOOTSTRAPPED)
#ifdef Q_OS_UNIX
#if !defined(QT_NO_ICONV)
# include "qiconvcodec_p.h"
#endif
#ifdef Q_OS_WIN