diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-07-16 14:10:42 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-12-19 19:22:16 +0000 |
| commit | 52934d74be7d882f3f584a348ce29bedff7fa7a7 (patch) | |
| tree | 4bc86679b6c6913de19be7328a62381c35003c21 /src/corelib/codecs | |
| parent | 98689cd2f9d3e9e4dac33ccf6679b90d4b39284f (diff) | |
configure: modernize iconv use
use library objects for all variants, and inline the tests.
Change-Id: I029f9a6655a783dab4a22abf601aadbb484c03af
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/corelib/codecs')
| -rw-r--r-- | src/corelib/codecs/codecs.pri | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri index f1bbde1d69..5d500ce521 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -56,8 +56,7 @@ qtConfig(textcodec) { qtConfig(iconv) { HEADERS += codecs/qiconvcodec_p.h SOURCES += codecs/qiconvcodec.cpp - qtConfig(gnu-libiconv): \ - QMAKE_USE_PRIVATE += iconv + QMAKE_USE_PRIVATE += iconv } win32 { |