Disable iconv on utf-8 based platforms
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:
parent
46e3aa2908
commit
39bdbc2cb5
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user