diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-04-06 10:15:14 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-04-07 09:08:41 +0000 |
| commit | 00ca784be60cb38dcb342755f602edc929805ce4 (patch) | |
| tree | 4d7703dc270345a7e65f9d97ddf197f43b756681 /src/plugins/imageformats/ico | |
| parent | 4701af32df5e74c0b273a158c17d5cd2ac5cd2a6 (diff) | |
Always build JPEG and GIF support as plugins
Our handling of plugins when Qt is build statically is
nowadays good enough, so we don't need to build the
JPEG and GIF support directly into Qt for static builds.
Let's simply always build them as plugins.
Also simplify the logic in configure, and get rid of the
no-gif, no-jpeg and no-png config variables.
[ChangelLog][Build system] JPEG and GIF image support is now
always built as a plugin. Removed -imageformat-[jpeg|gif]
arguments to configure.
Change-Id: Ic01559ff406c966807b3be8761252e8802adcdf7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/plugins/imageformats/ico')
| -rw-r--r-- | src/plugins/imageformats/ico/ico.pro | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/imageformats/ico/ico.pro b/src/plugins/imageformats/ico/ico.pro index 60afdaed70..7ca1f18cb1 100644 --- a/src/plugins/imageformats/ico/ico.pro +++ b/src/plugins/imageformats/ico/ico.pro @@ -1,10 +1,7 @@ TARGET = qico -QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-ico)" - -HEADERS += qicohandler.h main.h -SOURCES += main.cpp \ - qicohandler.cpp +HEADERS += main.h qicohandler.h +SOURCES += main.cpp qicohandler.cpp OTHER_FILES += ico.json PLUGIN_TYPE = imageformats |