diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-07-20 21:22:47 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-31 11:12:07 +0200 |
| commit | 39bdbc2cb5721840bf6dbe32cbf6d137a18903d4 (patch) | |
| tree | dc9e6d35c7f7ac1391856d0211d6a127ee7bfad7 /src/corelib | |
| parent | 46e3aa29081e0c043d745e590b9d3b9220f8d471 (diff) | |
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>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/codecs/codecs.pri | 7 | ||||
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri index 05a9499f4f..b08d412452 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -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 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 462c55e103..b379b2b111 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.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 |