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

CMake: Fix configuration of FEATURE_JPEG

Browse Source 
Without this patch JPEG support is always disabled, even though we can
build it from 3rdparty sources.

Change-Id: I9e619f0ca8ec3ca3e7c58981bb6af9b33426a029
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2020-03-24 17:19:41 +01:00
parent 0446bf5ba3
commit f716a87352
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/configure.cmake
View File

@ -829,7 +829,7 @@ qt_feature("ico" PUBLIC PRIVATE
qt_feature_definition("ico" "QT_NO_ICO" NEGATE VALUE "1")
qt_feature("jpeg" PRIVATE
LABEL "JPEG"
CONDITION QT_FEATURE_imageformatplugin AND JPEG_FOUND
CONDITION QT_FEATURE_imageformatplugin
DISABLE INPUT_libjpeg STREQUAL 'no'
)
qt_feature_definition("jpeg" "QT_NO_IMAGEFORMAT_JPEG" NEGATE)

1
util/cmake/configurejson2cmake.py
View File

@ -794,7 +794,6 @@ def get_feature_mapping():
"condition": "NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv )"
},
"incredibuild_xge": None,
"jpeg": {"condition": "QT_FEATURE_imageformatplugin AND JPEG_FOUND"},
"ltcg": None,
"msvc_mp": None,
"optimize_debug": None,