From 5cfc35d4f010e9d313e14f5130214d1643ffca3f Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 17 Nov 2023 14:12:44 +0000
Subject: [PATCH] qtbase: fix QLibraryInfo prefix with usrmerge

If Qt is configured to use 'relocatable' feature, QLibraryInfo will
at runtime try to determine its prefix path. If distro is using
usrmerge, Qt libraries are found from '/lib' before '/usr/lib' causing
Qt to use wrong prefix '/' when Qt was configure with '/usr' prefix.

With Yocto builds, we have no need for the relocatable feature,
disable it to avoid issues in usrmerge distros.

Pick-to: 6.6 6.5
Fixes: QTBUG-119140
Change-Id: Ied2ca04b5d46cff5d4bed1c456e95235156c58f0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 recipes-qt/qt6/qtbase_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb
index 73c7edb..7d9bba0 100644
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@@ -164,6 +164,7 @@ EXTRA_OECMAKE += "\
 
 EXTRA_OECMAKE:append:class-target = "\
     -DFEATURE_rpath=OFF \
+    -DFEATURE_relocatable=OFF \
     -DQT_QPA_DEFAULT_PLATFORM=${QT_QPA_DEFAULT_PLATFORM} \
 "