From 39bdbc2cb5721840bf6dbe32cbf6d137a18903d4 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 20 Jul 2012 21:22:47 +0200 Subject: 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 --- src/corelib/codecs/codecs.pri | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/corelib/codecs/codecs.pri') 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 -- cgit v1.2.3