summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/imageformats/configure.json16
-rw-r--r--src/plugins/imageformats/imageformats.pro6
2 files changed, 10 insertions, 12 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"
]
diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro
index be1e20a..4116591 100644
--- a/src/plugins/imageformats/imageformats.pro
+++ b/src/plugins/imageformats/imageformats.pro
@@ -21,9 +21,3 @@ qtConfig(jasper) {
} else:darwin: {
SUBDIRS += macjp2
}
-
-winrt {
- SUBDIRS -= tiff \
- tga \
- webp
-}