diff options
| -rw-r--r-- | config_help.txt | 1 | ||||
| -rw-r--r-- | configure.json | 7 | ||||
| -rw-r--r-- | src/plugins/imageformats/imageformats.pro | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/config_help.txt b/config_help.txt index fa18bf3964..fff7021aa8 100644 --- a/config_help.txt +++ b/config_help.txt @@ -274,6 +274,7 @@ Gui, printing, widget options: Image formats: -gif ............... Enable reading support for GIF [auto] + -ico ............... Enable support for ICO [yes] -libpng ............ Select used libpng [system/qt/no] -libjpeg ........... Select used libjpeg [system/qt/no] 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" ] }, { diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index 3de77c056d..f3ed37b722 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -!contains(QT_CONFIG, no-ico):SUBDIRS += ico +contains(QT_CONFIG, ico): SUBDIRS += ico contains(QT_CONFIG, jpeg): SUBDIRS += jpeg contains(QT_CONFIG, gif): SUBDIRS += gif |