diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2024-02-05 14:15:53 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-14 05:16:57 +0000 |
| commit | de18ee079e63528f05119064c6640a3578be85fa (patch) | |
| tree | 28b3bcbc5fd819534397e917a7429369d0661a47 | |
| parent | 5167e03636e34fefdbfa2ff19958c29aee04082a (diff) | |
qtbase: prefer system png
Update PACKAGECONFIG[png] to make sure we use the system libpng
as expected.
Fixes: QTBUG-121795
Pick-to: 6.5
Change-Id: I051a9a40a9a7bfd001b77c51db9eab2b19147efb
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit b8a440f3103917834f4756f269d167fae87a0da5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 0929fe923642d2ec4fa69eede9dca1af7861db0b)
| -rw-r--r-- | recipes-qt/qt6/qtbase_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 665bef2..8f2b628 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -132,7 +132,7 @@ PACKAGECONFIG[libinput] = "-DFEATURE_libinput=ON,-DFEATURE_libinput=OFF,libinput PACKAGECONFIG[linuxfb] = "-DFEATURE_linuxfb=ON,-DFEATURE_linuxfb=OFF" PACKAGECONFIG[mtdev] = "-DFEATURE_mtdev=ON,-DFEATURE_mtdev=OFF,mtdev" PACKAGECONFIG[no-opengl] = "-DINPUT_opengl=no" -PACKAGECONFIG[png] = "-DFEATURE_png=ON,-DFEATURE_png=OFF,libpng" +PACKAGECONFIG[png] = "-DFEATURE_system_png=ON,-DFEATURE_png=OFF,libpng" PACKAGECONFIG[tslib] = "-DFEATURE_tslib=ON,-DFEATURE_tslib=OFF,tslib" PACKAGECONFIG[vulkan] = "-DFEATURE_vulkan=ON,-DFEATURE_vulkan=OFF,vulkan-headers,vulkan-loader" PACKAGECONFIG[xcb] = "-DFEATURE_xcb=ON,-DFEATURE_xcb=OFF,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-cursor" |