diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-02 12:53:54 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-02 12:53:54 +0200 |
| commit | cee7701c76579ff139b42f2092306a88f0394dc5 (patch) | |
| tree | 25eb915f22cd8172210d29e299d17b39bdc9ebfe /src/plugins/imageformats/imageformats.pro | |
| parent | 9293902f325341f0c188bdf4f662c3a7d949a343 (diff) | |
| parent | a33e3aeac74c8fc8d1fff7a244083d96f9bba70f (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Idd134e350e760a0237dce4ef00d10e1c35dbeb67
Diffstat (limited to 'src/plugins/imageformats/imageformats.pro')
| -rw-r--r-- | src/plugins/imageformats/imageformats.pro | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index d6c59ee..be1e20a 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -2,17 +2,21 @@ TEMPLATE = subdirs SUBDIRS = \ # dds \ tga \ - tiff \ - wbmp \ - webp + wbmp + +include($$OUT_PWD/../../imageformats/qtimageformats-config.pri) +QT_FOR_CONFIG += imageformats-private + +qtConfig(tiff): SUBDIRS += tiff +qtConfig(webp): SUBDIRS += webp darwin: SUBDIRS += macheif qtConfig(regularexpression): \ SUBDIRS += icns -config_libmng: SUBDIRS += mng -config_jasper { +qtConfig(mng): SUBDIRS += mng +qtConfig(jasper) { SUBDIRS += jp2 } else:darwin: { SUBDIRS += macjp2 |