diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-12 18:50:36 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 04:28:15 +0000 |
| commit | cf166e58398779590e39f3a2635d953c6b53bd4b (patch) | |
| tree | bc03bcbc1f0d55a640eb6eccb55af1a4fce52a9d /src/corelib | |
| parent | 60985aa42b37217fb4c01ed85bbf6f14410c3491 (diff) | |
iconv-related cleanup in codecs.pri
The configuration system already takes care of setting QT_NO_ICONV.
Also move the platform conditions for using iconv from the pri file
to the .json.
Change-Id: I91b08bcee6799deddabcbb4a91d0a3f9ed7f0f28
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/codecs/codecs.pri | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri index 58fde6cfc0..4fa778d042 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -40,20 +40,17 @@ qtConfig(icu) { codecs/qeuckrcodec.cpp \ codecs/qbig5codec.cpp - unix:!qnx:!darwin:!linux-android-* { - qtConfig(iconv) { - HEADERS += codecs/qiconvcodec_p.h - SOURCES += codecs/qiconvcodec.cpp - qtConfig(gnu-libiconv) { - DEFINES += GNU_LIBICONV - QMAKE_USE_PRIVATE += iconv - } else: qtConfig(sun-libiconv) { - DEFINES += GNU_LIBICONV - } + qtConfig(iconv) { + HEADERS += codecs/qiconvcodec_p.h + SOURCES += codecs/qiconvcodec.cpp + qtConfig(gnu-libiconv) { + DEFINES += GNU_LIBICONV + QMAKE_USE_PRIVATE += iconv + } else: qtConfig(sun-libiconv) { + DEFINES += GNU_LIBICONV } - } else:!win32-msvc* { - DEFINES += QT_NO_ICONV } + win32 { SOURCES += codecs/qwindowscodec.cpp HEADERS += codecs/qwindowscodec_p.h |