diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-03-24 17:19:41 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-03-25 10:51:55 +0100 |
| commit | f716a8735285d3919164a0faadc542a866465d3d (patch) | |
| tree | 0d5ebc523012a3ec593caf4aeee69e6867f69e3c /src/gui/configure.cmake | |
| parent | 0446bf5ba30b83bb85144f67e8c3b151d9a8cbca (diff) | |
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 <alexandru.croitor@qt.io>
Diffstat (limited to 'src/gui/configure.cmake')
| -rw-r--r-- | src/gui/configure.cmake | 2 |
1 files changed, 1 insertions, 1 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) |