From d173fda6e9954a0f44966f8f0049f6d12b964123 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Tue, 12 Dec 2023 14:45:11 +0100 Subject: [PATCH] Use the correct CMake argument name for -libpng and -libjpeg The qt_feature calls are for "jpeg" and "png". Pick-to: 6.6 6.5 Fixes: QTBUG-120036 Change-Id: I43e69d9fd1e08383b5ddfbfe194eaa2f2ae52f50 Reviewed-by: Alexandru Croitor (cherry picked from commit 8646010223c7a103fc53ff0705dece8904ee268c) Reviewed-by: Qt Cherry-pick Bot --- cmake/configure-cmake-mapping.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index 5ccd4964def..c32e3179ed9 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -160,8 +160,8 @@ The following table describes the mapping of configure options to CMake argument | -xkbcommon | -DFEATURE_xkbcommon=ON | | | -gif | -DFEATURE_gif=ON | | | -ico | -DFEATURE_ico=ON | | -| -libpng | -DFEATURE_libpng=ON | | -| -libjpeg | -DFEATURE_libjpeg=ON | | +| -libpng | -DFEATURE_png=ON | | +| -libjpeg | -DFEATURE_jpeg=ON | | | -sql- | -DFEATURE_sql_=ON | | | -sqlite [qt/system] | -DFEATURE_system_sqlite=OFF/ON | | | -disable-deprecated-up-to | -DQT_DISABLE_DEPRECATED_UP_TO= | |