aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIndivara Weerasuriya <indivara.weerasuriya@qt.io>2024-07-30 19:48:45 +0900
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-11-20 13:35:26 +0000
commit64959afaf06b1f7e5a382d1af86dd8ad3f6f37e0 (patch)
treebd9f675399bdf57114976fa153d5cb9db6d7dce9
parent59ae0b13d2bb14fbf12117f2f55bfcb6f06f104b (diff)
Switch to qt6-layer and fix Qt 6 meson build error
Bug-AGL: SPEC-5294 Change-Id: Iba1acf0fc0cc5b1b2b9ec52805e105c81f10ca56 Signed-off-by: Indivara Weerasuriya <indivara.weerasuriya@qt.io> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30142 Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-rw-r--r--conf/layer.conf5
1 files changed, 4 insertions, 1 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 5195d3cda..4aa885b0e 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -18,4 +18,7 @@ LICENSE_PATH += "${LAYERDIR}/licenses"
LAYERSERIES_COMPAT_agldemo = "scarthgap"
-LAYERDEPENDS_agldemo = "aglcore qt5-layer openembedded-layer networking-layer multimedia-layer flutter-layer meta-app-framework"
+LAYERDEPENDS_agldemo = "aglcore qt6-layer openembedded-layer networking-layer multimedia-layer flutter-layer meta-app-framework"
+
+########### WORKAROUND FOR MESON and QT6 ############
+QT6_INSTALL_LIBEXECDIR := "${bindir}"