From f716a8735285d3919164a0faadc542a866465d3d Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Tue, 24 Mar 2020 17:19:41 +0100 Subject: [PATCH] CMake: Fix configuration of FEATURE_JPEG Without this patch JPEG support is always disabled, even though we can build it from 3rdparty sources. Change-Id: I9e619f0ca8ec3ca3e7c58981bb6af9b33426a029 Reviewed-by: Alexandru Croitor --- src/gui/configure.cmake | 2 +- util/cmake/configurejson2cmake.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index bf9d0e71f1..45ca061ed7 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -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) diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index afee5156a0..31a0dda7dc 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -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,