diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 11:30:00 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 11:30:01 +0200 |
| commit | d314819fc02139e05e16c56657898c704f7fb48f (patch) | |
| tree | a61ba968233634948401c8339f9613844de1c2b5 /src/corelib/codecs | |
| parent | 9f888d2fde9c5413e5519e0914e9b13638760985 (diff) | |
| parent | e0e9e196a72ffe5457034894eaaadc90ed0d34ef (diff) | |
Merge dev into 5.8
Change-Id: I41ee7b50534b01cf042bed8bb8824ba2e5026a29
Diffstat (limited to 'src/corelib/codecs')
| -rw-r--r-- | src/corelib/codecs/codecs.pri | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri index fdaec33c5a..4fa778d042 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -17,7 +17,7 @@ SOURCES += \ codecs/qtsciicodec.cpp \ codecs/qutfcodec.cpp -contains(QT_CONFIG,icu) { +qtConfig(icu) { HEADERS += \ codecs/qicucodec_p.h SOURCES += \ @@ -40,20 +40,17 @@ contains(QT_CONFIG,icu) { codecs/qeuckrcodec.cpp \ codecs/qbig5codec.cpp - unix:!qnx:!darwin:!linux-android-* { - contains(QT_CONFIG, iconv) { - HEADERS += codecs/qiconvcodec_p.h - SOURCES += codecs/qiconvcodec.cpp - contains(QT_CONFIG, gnu-libiconv) { - DEFINES += GNU_LIBICONV - LIBS_PRIVATE *= -liconv - } else: contains(QT_CONFIG, 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 |