summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.json2
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" ]
},