diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-04 03:04:56 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-04 03:04:56 +0200 |
| commit | 2ef670693de7dc36aa77b577a9fc0513602055b3 (patch) | |
| tree | e978d9930dd03e267d1465038d34a869092889a6 /src | |
| parent | 7c596241e881ef09c72f152dfb7aa7def3b59f41 (diff) | |
| parent | 7625a06bd7bfcf77e896086d049b334f1b66c75d (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I5afd4c2812825b822b4a855f4f0ef23b5d8562af
Diffstat (limited to 'src')
| -rw-r--r-- | src/imageformats/configure.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json index 4718398..5b876c3 100644 --- a/src/imageformats/configure.json +++ b/src/imageformats/configure.json @@ -155,7 +155,7 @@ "webp": { "label": "WEBP", "disable": "input.webp == 'no'", - "condition": "features.imageformatplugin && !(config.winrt && arch.arm)", + "condition": "features.imageformatplugin", "output": [ "privateFeature" ] |