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 /configure.json | |
| 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 'configure.json')
| -rw-r--r-- | configure.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.json b/configure.json index 86bd601d8d..f33a3fc588 100644 --- a/configure.json +++ b/configure.json @@ -2033,20 +2033,20 @@ "description": "POSIX iconv", "enable": "input.iconv == 'posix'", "disable": "input.iconv == 'sun' || input.iconv == 'gnu' || input.iconv == 'no'", - "condition": "!config.win32 && tests.posix-iconv" + "condition": "!config.win32 && !config.qnx && !config.android && !config.darwin && tests.posix-iconv" }, "sun-libiconv": { "description": "SUN iconv", "enable": "input.iconv == 'sun'", "disable": "input.iconv == 'posix' || input.iconv == 'gnu' || input.iconv == 'no'", - "condition": "!config.win32 && !features.posix-libiconv && tests.sun-iconv", + "condition": "!config.win32 && !config.qnx && !config.android && !config.darwin && !features.posix-libiconv && tests.sun-iconv", "output": [ "privateFeature", "publicQtConfig" ] }, "gnu-libiconv": { "description": "GNU iconv", "enable": "input.iconv == 'gnu'", "disable": "input.iconv == 'posix' || input.iconv == 'sun' || input.iconv == 'no'", - "condition": "!config.win32 && !features.posix-libiconv && !features.sun-libiconv && libs.gnu_iconv", + "condition": "!config.win32 && !config.qnx && !config.android && !config.darwin && !features.posix-libiconv && !features.sun-libiconv && libs.gnu_iconv", "output": [ "privateFeature" ] }, "freetype": { |