Split modules into essentials and addons

Add separate packagegroup recipes for essential and addon
Qt modules and make sure all modules are included in those.
Avoid unnecessary dublication with packagegroups and remove
the toolchain target packagegroup, instead use the combined
qt6-modules packagegroup for the toolchain as well. This will
install all development packages as long as SDKIMAGE_FEATURES
has dev-pkgs enabled.

Task-number: QTBUG-91902
Pick-to: 6.1
Change-Id: I574da02ae1632c1e41490a1244398f31eaeeb97b
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>

recipes-qt/meta/meta-toolchain-qt6.bb

@@ -6,4 +6,4 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 inherit populate_sdk populate_sdk_qt6_base
 
 TOOLCHAIN_HOST_TASK_append = " nativesdk-packagegroup-qt6-toolchain-host"
-TOOLCHAIN_TARGET_TASK_append = " packagegroup-qt6-toolchain-target"
+TOOLCHAIN_TARGET_TASK_append = " packagegroup-qt6-modules"

recipes-qt/packagegroups/packagegroup-qt6-addons.bb

@@ -0,0 +1,41 @@
+DESCRIPTION = "Qt6 addon modules"
+LICENSE = "MIT"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
+RDEPENDS_${PN} += " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
+    qt5compat \
+    qtcharts \
+    qtcoap \
+    qtconnectivity \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d', '', d)} \
+    qtdeviceutilities \
+    qtgraphicaleffects \
+    qtimageformats \
+    qtlottie \
+    qtmqtt \
+    qtnetworkauth \
+    qtopcua \
+    qtpositioning \
+    qtquick3d \
+    qtquickdesigner-components \
+    qtquicktimeline \
+    qtremoteobjects \
+    qtscxml \
+    qtsensors \
+    qtserialbus \
+    qtserialport \
+    qtshadertools \
+    qtspeech \
+    qtsvg \
+    qttranslations \
+    qtvirtualkeyboard \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
+    qtwebchannel \
+    qtwebsockets \
+"

recipes-qt/packagegroups/packagegroup-qt6-essentials.bb

@@ -0,0 +1,18 @@
+DESCRIPTION = "Qt6 essential modules"
+LICENSE = "MIT"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
+RDEPENDS_${PN} += " \
+    qtbase \
+    qtdeclarative \
+    qtquickcontrols2 \
+    qttools \
+    qttranslations-qtbase \
+    qttranslations-qtdeclarative \
+    qttranslations-qtquickcontrols2 \
+"

recipes-qt/packagegroups/packagegroup-qt6-modules.bb

@@ -8,35 +8,6 @@ inherit packagegroup
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
-    qt5compat \
-    qtbase \
-    qtcharts \
-    qtcoap \
-    qtconnectivity \
-    qtdeclarative \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtgraphicaleffects', '', d)} \
-    qtimageformats \
-    qtmqtt \
-    qtnetworkauth \
-    qtopcua \
-    qtpositioning \
-    qtquick3d \
-    qtquickcontrols2 \
-    qtquickdesigner-components \
-    qtquicktimeline \
-    qtremoteobjects \
-    qtscxml \
-    qtsensors \
-    qtserialbus \
-    qtserialport \
-    qtshadertools \
-    qtspeech \
-    qtsvg \
-    qttools \
-    qttranslations \
-    qtvirtualkeyboard \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
-    qtwebchannel \
-    qtwebsockets \
+    packagegroup-qt6-essentials \
+    packagegroup-qt6-addons \
 "

recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb

@@ -1,43 +0,0 @@
-DESCRIPTION = "Qt6 development packages"
-LICENSE = "MIT"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup
-
-PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
-
-
-RDEPENDS_${PN} += "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \
-    qt5compat-dev \
-    qtbase-dev \
-    qtcharts-dev \
-    qtcoap-dev \
-    qtconnectivity-dev \
-    qtdeclarative-dev \
-    qtgraphicaleffects-dev \
-    qtimageformats-dev \
-    qtmqtt-dev \
-    qtnetworkauth-dev \
-    qtopcua-dev \
-    qtpositioning-dev \
-    qtquick3d-dev \
-    qtquickcontrols2-dev \
-    qtquickdesigner-components-dev \
-    qtquicktimeline-dev \
-    qtremoteobjects-dev \
-    qtscxml-dev \
-    qtsensors-dev \
-    qtserialbus-dev \
-    qtserialport-dev \
-    qtshadertools-dev \
-    qtspeech-dev \
-    qtsvg-dev \
-    qttools-dev \
-    qttranslations-dev \
-    qtvirtualkeyboard-dev \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \
-    qtwebchannel-dev \
-    qtwebsockets-dev \
-"