Fix some configure.json conditions for qtimageformats

The auto-generated add_subdirectory conditions in qtimageformats use
QT_FEATURE_foo and not QT_FEATURE_system_foo.
But the non-system ones don't actually check if the respective
qt_find_package(TIFF) got found.

Fix the conditions of the non system features to be the same as the
system ones.

Change-Id: I96f889cf7061721b829d562707c42aa0e29720df
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 6 insertions, 0 deletions

diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index 2de2567803..f929ac142d 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -716,9 +716,15 @@ def parseFeature(ctx, feature, data, cm_fh):
         'system-sqlite': None,
         'system-xcb': None,
         'system-zlib': None,
+        'tiff': {
+            'condition': 'QT_FEATURE_imageformatplugin AND TIFF_FOUND'
+        },
         'use_gold_linker': None,
         '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
     }