summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2022-05-16 09:08:27 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-06-12 11:46:19 +0000
commitf183b541db00e772f3acec998a70e5e279a79d47 (patch)
tree865c31c0c30cdeda360688206637044325cdedc1
parente4e8d9a43ca21255138fbea13d606dd82a68367b (diff)
Enable static jpeg feature6.2
All required qtbase dependencies has been updated long time ago. Change-Id: Ibcf2b8d5397980d8b51a829b580e12a899ded1f8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit ba4314a4392ac0e86b7d7b47bf5ef01035628db2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--configure.cmake1
1 files changed, 0 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake
index d65b8e544..8bd2e8ae9 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -359,7 +359,6 @@ qt_feature("webengine-qt-libjpeg" PRIVATE
AND TARGET Qt::Gui
AND QT_FEATURE_jpeg
AND NOT QT_FEATURE_system_jpeg
- AND FALSE # FIXME requires qtbase dep update
)
qt_feature("webengine-system-harfbuzz" PRIVATE
LABEL "harfbuzz"