diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-07-15 16:29:37 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-18 17:10:57 +0000 |
| commit | 6903cad03edc7db2ed808f5a90f0e02bfca5fe7d (patch) | |
| tree | e9bdce4a31cd981ccb9c563c9fca07fbad6a7739 /configure.json | |
| parent | d90db0f136d727f8e6b9a566eee3eae80cd7d81e (diff) | |
Make the ICO image format a configurable feature
... including a [-no]-ico command line option.
Change-Id: I3cb13d2be72b512f72f8dcdb9de72e7a99e36e47
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 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 181fe8aa09..d79e125c63 100644 --- a/configure.json +++ b/configure.json @@ -99,6 +99,7 @@ "harfbuzz": { "type": "enum", "values": [ "no", "qt", "system" ] }, "headersclean": "boolean", "host-option": "string", + "ico": "boolean", "iconv": { "type": "enum", "values": [ "no", "yes", "posix", "sun", "gnu" ] }, "icu": "boolean", "imf": { "type": "boolean", "name": "qqnx_imf" }, @@ -2022,6 +2023,10 @@ "condition": "features.png && libs.libpng", "output": [ "publicQtConfig" ] }, + "ico": { + "description": "ICO", + "output": [ "feature" ] + }, "system-zlib": { "description": "Using system zlib", "condition": "config.darwin || libs.zlib", @@ -2766,7 +2771,7 @@ Please apply the patch corresponding to your Standard Library vendor, found in { "section": "Image formats", "entries": [ - "gif", "jpeg", "system-jpeg", "png", "system-png" + "gif", "ico", "jpeg", "system-jpeg", "png", "system-png" ] }, { |