From: Indivara Weerasuriya <indivara.weerasuriya@qt.io>
Date: Tue, 30 Jul 2024 10:56:01 +0000 (+0900)
Subject: Fix meson unable to find Qt 6 uic
X-Git-Tag: 18.91.0~7
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=57640e9fa1bb637efc731770b9947032677e1e99;p=AGL%2Fmeta-agl-demo.git

Fix meson unable to find Qt 6 uic

Change-Id: I22beb7fdaf32c2c56653eb192892b50ae72ed733
Signed-off-by: Indivara Weerasuriya <indivara.weerasuriya@qt.io>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30144
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
---

diff --git a/classes/meson_qt6_path.bbclass b/classes/meson_qt6_path.bbclass
new file mode 100644
index 000000000..adbab9c99
--- /dev/null
+++ b/classes/meson_qt6_path.bbclass
@@ -0,0 +1,9 @@
+inherit meson pkgconfig qt6-paths
+
+# fix meson cannot find Qt6 uic
+do_configure:prepend () {
+   QT_HOST_LIBEXECS_DIR="$(qmake -query QT_HOST_LIBEXECS)"
+   bbwarn "QT_HOST_LIBEXECS_DIR ${QT_HOST_LIBEXECS_DIR}"
+   export PATH=$PATH:${QT_HOST_LIBEXECS_DIR}
+}
+