From f789fa8fb25b6a19acbd131006cdf72e1ed9944e Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Mon, 8 Sep 2025 10:18:14 +0200 Subject: [PATCH] qt6-layer: add QT6 support for CCiMX6UL This commit adds QT6 support for the CCiMX6UL platform and QT6 as the default setup. https://onedigi.atlassian.net/browse/DEL-9757 Signed-off-by: Mike Engel --- meta-digi-arm/conf/templates/ccimx6ulsbc/bblayers.conf.sample | 2 +- .../qt6-layer/NXP/recipes-qt/qt6/qtbase_%.bbappend | 2 ++ .../qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-dey.bb | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/conf/templates/ccimx6ulsbc/bblayers.conf.sample b/meta-digi-arm/conf/templates/ccimx6ulsbc/bblayers.conf.sample index 556605800..d8e908851 100644 --- a/meta-digi-arm/conf/templates/ccimx6ulsbc/bblayers.conf.sample +++ b/meta-digi-arm/conf/templates/ccimx6ulsbc/bblayers.conf.sample @@ -13,7 +13,7 @@ BBLAYERS ?= " \ ##DIGIBASE##/meta-openembedded/meta-python \ ##DIGIBASE##/meta-openembedded/meta-networking \ ##DIGIBASE##/meta-openembedded/meta-webserver \ - ##DIGIBASE##/meta-qt5 \ + ##DIGIBASE##/meta-qt6 \ ##DIGIBASE##/meta-swupdate \ ##DIGIBASE##/meta-freescale \ ##DIGIBASE##/meta-fsl-demos \ diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtbase_%.bbappend b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtbase_%.bbappend index f0732e361..409f64ed5 100644 --- a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtbase_%.bbappend +++ b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtbase_%.bbappend @@ -20,6 +20,8 @@ PACKAGECONFIG_PLATFORM_EGLFS:mx9-nxp-bsp = " \ PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = "vulkan" PACKAGECONFIG_VULKAN_IMX_GPU:mx9-nxp-bsp = "vulkan" +PACKAGECONFIG_DEFAULT:remove:ccimx6ul = "icu" + do_install:append () { install -d ${D}${sysconfdir}/profile.d/ install -m 0755 ${WORKDIR}/qt-${IMX_BACKEND}.sh ${D}${sysconfdir}/profile.d/qt.sh diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-dey.bb b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-dey.bb index dae243a25..fa1923bec 100644 --- a/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-dey.bb +++ b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-dey.bb @@ -1,5 +1,6 @@ # Copyright 2019-20 NXP # Released under the MIT license (see COPYING.MIT for the terms) +# Copyright (C) 2025, Digi International Inc. DESCRIPTION = "Package group for i.MX Qt6" LICENSE = "MIT" @@ -29,11 +30,13 @@ QT6_IMAGE_INSTALL_CINEMATICEXPERIENCE:ccmp25 = "cinematicexperience-rhi cinemati QT6_IMAGE_INSTALL_EXAMPLES = "qtbase-examples qtdeclarative-examples" # Make room in ccmp15-dvk Qt6 images by removing examples QT6_IMAGE_INSTALL_EXAMPLES:ccmp15 = "" +QT6_IMAGE_INSTALL_EXAMPLES:ccimx6ul = "qtbase-examples" QT6_IMAGE_INSTALL_FONTS = "ttf-dejavu-common ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-serif " QT6_IMAGE_INSTALL_QUICK3D = "qtquick3d qtquick3d-examples" # Quick3d does not work on systems without a proper GPU QT6_IMAGE_INSTALL_QUICK3D:ccimx93 = "" +QT6_IMAGE_INSTALL_QUICK3D:ccimx6ul = "" # Make room in ccmp15-dvk Qt6 images by removing examples QT6_IMAGE_INSTALL_QUICK3D:ccmp15 = "qtquick3d"