diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-09 15:16:59 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-09 22:12:20 +0100 |
| commit | 238f466d49a73bb81491f5de11bb6bdfdc12cc0b (patch) | |
| tree | ad0c0f2a317bd613404ad4cbc60b23152fe8ab58 /util/cmake | |
| parent | 3776c51fa02897f8781f3854db2b20d3fe217808 (diff) | |
configurejson2cmake: Fix conditions of features 'tiff' and 'webp'
These features must not depend on TIFF_FOUND/WrapWebP_FOUND, otherwise
it's impossible to use the bundled libtiff/libwebp.
The default-converted conditions are good enough.
This reverts 82941a3f1bab6c385376761d53456c838b6cbaad which tried to fix
the qtimageformats build. More work to fix the bundled libwebp is to be
done in the qtimageformats repo.
Change-Id: I5050a6e5f2b3c95e3d5fea660f7fbb630113b7dd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util/cmake')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 15dc067f26..c62169a88b 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -976,10 +976,8 @@ endif()""", "sql-sqlite": {"condition": "QT_FEATURE_datestring"}, "stl": None, # Do we really need to test for this in 2018?! "strip": None, - "tiff": {"condition": "QT_FEATURE_imageformatplugin AND TIFF_FOUND"}, "verifyspec": None, # qmake specific... "warnings_are_errors": None, # FIXME: Do we need these? - "webp": {"condition": "QT_FEATURE_imageformatplugin AND WrapWebP_FOUND"}, "xkbcommon-system": None, # another system library, just named a bit different from the rest } return feature_mapping |