diff options
| author | aavit <eirik.aavitsland@digia.com> | 2012-11-28 09:58:11 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-29 13:47:10 +0100 |
| commit | 7f4644f6ed02eca59dd96077b7d43372280e21c9 (patch) | |
| tree | 98c69bc98a2d4bf044b1c7bf76aef43144bf5b0b /src/plugins/imageformats/imageformats.pro | |
| parent | 7f5c46b18c9390da641d5c43431c3759c7453f46 (diff) | |
Use the bundled zlib in QtCore, if present.
Ref. Ie986f47e00fd0c16f2ba04d27f4258a20d61b260
Change-Id: I902cd52c2f08466cf6f42cc5e1813206e2051e95
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/plugins/imageformats/imageformats.pro')
| -rw-r--r-- | src/plugins/imageformats/imageformats.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index 5bde0c7..79be7ae 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -1,5 +1,6 @@ TEMPLATE = subdirs SUBDIRS = \ tga \ - wbmp -contains(QT_CONFIG, system-zlib): SUBDIRS += mng tiff + wbmp \ + mng \ + tiff |