From 0a434cc00f930ffd24e2466f8f8209baebce20ec Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Mon, 1 Aug 2016 10:31:12 +0200
Subject: [PATCH] add missing 'disable' fields to {sun,gnu}-libiconv features

Change-Id: Ieed30c1cf388157c47c8a58979b8c214223d351a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 configure.json | 2 ++
 1 file changed, 2 insertions(+)

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" ]
         },