AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some configure.json conditions for qtimageformats

Browse Source 
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>
This commit is contained in:
Alexandru Croitor 2019-06-05 22:41:38 +02:00 committed by Simon Hausmann
parent f5a494f3c1
commit 82941a3f1b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/cmake/configurejson2cmake.py
View File

@ -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
}