summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2020-03-24 17:19:41 +0100
committerLeander Beernaert <leander.beernaert@qt.io>2020-03-25 10:51:55 +0100
commitf716a8735285d3919164a0faadc542a866465d3d (patch)
tree0d5ebc523012a3ec593caf4aeee69e6867f69e3c /util
parent0446bf5ba30b83bb85144f67e8c3b151d9a8cbca (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 'util')
-rwxr-xr-xutil/cmake/configurejson2cmake.py1
1 files changed, 0 insertions, 1 deletions
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,