From 0368bb6b4e8554b87ad02f9a759ea6a66f6498d7 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Wed, 1 Feb 2023 12:01:05 +0100
Subject: [PATCH] meta-digi-dey: add QT6 support

https://onedigi.atlassian.net/browse/DEL-8347

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-dey/classes/populate_sdk_qt6.bbclass              | 6 ++++++
 meta-digi-dey/classes/qt-version.bbclass                    | 6 ++++--
 meta-digi-dey/conf/layer.conf                               | 4 ++++
 .../packagegroups/packagegroup-qt6-addons.bbappend          | 5 +++++
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 meta-digi-dey/classes/populate_sdk_qt6.bbclass
 create mode 100644 meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-addons.bbappend

diff --git a/meta-digi-dey/classes/populate_sdk_qt6.bbclass b/meta-digi-dey/classes/populate_sdk_qt6.bbclass
new file mode 100644
index 000000000..60879b86d
--- /dev/null
+++ b/meta-digi-dey/classes/populate_sdk_qt6.bbclass
@@ -0,0 +1,6 @@
+# Copyright (c) 2023, Digi International Inc.
+
+inherit populate_sdk_qt6_base
+
+TOOLCHAIN_HOST_TASK:append = " nativesdk-packagegroup-qt6-toolchain-host"
+TOOLCHAIN_TARGET_TASK:append = " packagegroup-qt6-modules"
diff --git a/meta-digi-dey/classes/qt-version.bbclass b/meta-digi-dey/classes/qt-version.bbclass
index 35659cbf7..4224ebe47 100644
--- a/meta-digi-dey/classes/qt-version.bbclass
+++ b/meta-digi-dey/classes/qt-version.bbclass
@@ -7,6 +7,8 @@
 # Copyright (c) 2023, Digi International Inc.
 #
 
-QT_AVAILABLE = "${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'qt5-layer', 'true', 'false', d)}"
-QT_VERSION = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}"
+QT_AVAILABLE = "${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'qt5-layer qt6-layer', 'true', 'false', d)}"
+QT_VERSION = \
+    "${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt6-layer', 'qt6', \
+        bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d), d)}"
 QT_POPULATE_SDK = "${@oe.utils.vartrue('QT_AVAILABLE', 'populate_sdk_${QT_VERSION}', '', d)}"
diff --git a/meta-digi-dey/conf/layer.conf b/meta-digi-dey/conf/layer.conf
index 76e14522b..c456ba13c 100644
--- a/meta-digi-dey/conf/layer.conf
+++ b/meta-digi-dey/conf/layer.conf
@@ -18,6 +18,10 @@ BBFILES_DYNAMIC += " \
     qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \
     qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/${DEY_BUILD_PLATFORM}/*/*/*.bb \
     qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/${DEY_BUILD_PLATFORM}/*/*/*.bbappend \
+    qt6-layer:${LAYERDIR}/dynamic-layers/qt6-layer/*/*/*.bb \
+    qt6-layer:${LAYERDIR}/dynamic-layers/qt6-layer/*/*/*.bbappend \
+    qt6-layer:${LAYERDIR}/dynamic-layers/qt6-layer/${DEY_BUILD_PLATFORM}/*/*/*.bb \
+    qt6-layer:${LAYERDIR}/dynamic-layers/qt6-layer/${DEY_BUILD_PLATFORM}/*/*/*.bbappend \
 "
 
 BBFILE_COLLECTIONS += "digi-dey"
diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-addons.bbappend b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-addons.bbappend
new file mode 100644
index 000000000..f842dd6a5
--- /dev/null
+++ b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-addons.bbappend
@@ -0,0 +1,5 @@
+# Copyright (c) 2023, Digi International Inc.
+
+# qtdeviceutilities provides a networksettings module that depends
+# on "connman". This conflicts with NetworkManager
+RDEPENDS:${PN}:remove:dey = "qtdeviceutilities"