diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-16 17:07:23 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-16 17:07:23 +0100 |
| commit | 51e7fa714ca76fd9edb342fc8e97451086e46fe3 (patch) | |
| tree | 49caeb7689e53f35437523334ddef8836111a66b /src/imageformats | |
| parent | 4c932c40349d837592c6c429fabf2511596e0fd7 (diff) | |
| parent | 10c6352fb384b732e942af9ada4cb8d07a793c45 (diff) | |
| download | qtimageformats-51e7fa714ca76fd9edb342fc8e97451086e46fe3.tar.gz | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: Ia9a6efda0bea5bc7c5f9f8cd4735da0bd3c0da26
Diffstat (limited to 'src/imageformats')
| -rw-r--r-- | src/imageformats/configure.json | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json index 3b38fae..4718398 100644 --- a/src/imageformats/configure.json +++ b/src/imageformats/configure.json @@ -34,7 +34,8 @@ ] }, "sources": [ - "-ljasper" + { "type": "pkgConfig", "args": "jasper" }, + { "libs": "-ljasper" } ] }, "mng": { @@ -55,7 +56,8 @@ ] }, "sources": [ - "-lmng" + { "type": "pkgConfig", "args": "libmng" }, + { "libs": "-lmng" } ] }, "tiff": { @@ -82,7 +84,8 @@ ] }, "sources": [ - "-ltiff" + { "type": "pkgConfig", "args": "libtiff-4" }, + { "libs": "-ltiff" } ] }, "webp": { @@ -112,7 +115,8 @@ ] }, "sources": [ - "-lwebp -lwebpdemux -lwebpmux" + { "type": "pkgConfig", "args": "libwebp libwebpmux libwebpdemux" }, + { "libs": "-lwebp -lwebpdemux -lwebpmux" } ] } }, @@ -136,7 +140,7 @@ "tiff": { "label": "TIFF", "disable": "input.tiff == 'no'", - "condition": "features.imageformatplugin", + "condition": "features.imageformatplugin && !(config.winrt && arch.i386)", "output": [ "privateFeature" ] @@ -151,7 +155,7 @@ "webp": { "label": "WEBP", "disable": "input.webp == 'no'", - "condition": "features.imageformatplugin", + "condition": "features.imageformatplugin && !(config.winrt && arch.arm)", "output": [ "privateFeature" ] |