diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-01 10:31:12 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-11 08:05:45 +0000 |
| commit | 0a434cc00f930ffd24e2466f8f8209baebce20ec (patch) | |
| tree | 1a2ff20f4472ae1350953bee8153d57c26d49c89 /configure.json | |
| parent | 30cac3ed2d5c24ce151911dec59fb6f6cf8ca6c6 (diff) | |
add missing 'disable' fields to {sun,gnu}-libiconv features
Change-Id: Ieed30c1cf388157c47c8a58979b8c214223d351a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.json b/configure.json index 976903fd51..167caff646 100644 --- a/configure.json +++ b/configure.json @@ -1735,11 +1735,13 @@ }, "sun-libiconv": { "description": "SUN iconv", + "disable": "input.iconv == 'no'", "condition": "!config.win32 && !tests.posix-iconv && tests.sun-iconv", "output": [ "publicQtConfig" ] }, "gnu-libiconv": { "description": "GNU iconv", + "disable": "input.iconv == 'no'", "condition": "!config.win32 && !tests.posix-iconv && !tests.sun-iconv && tests.gnu-iconv", "output": [ "publicQtConfig" ] }, |