From e60fed4f98c722969ee635e90299e35518dfb634 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 24 Mar 2021 12:44:36 +0200
Subject: [PATCH] Split modules into essentials and addons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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         |  2 +-
 .../packagegroups/packagegroup-qt6-addons.bb  | 41 ++++++++++++++++++
 .../packagegroup-qt6-essentials.bb            | 18 ++++++++
 .../packagegroups/packagegroup-qt6-modules.bb | 33 +-------------
 .../packagegroup-qt6-toolchain-target.bb      | 43 -------------------
 5 files changed, 62 insertions(+), 75 deletions(-)
 create mode 100644 recipes-qt/packagegroups/packagegroup-qt6-addons.bb
 create mode 100644 recipes-qt/packagegroups/packagegroup-qt6-essentials.bb
 delete mode 100644 recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb

diff --git a/recipes-qt/meta/meta-toolchain-qt6.bb b/recipes-qt/meta/meta-toolchain-qt6.bb
index 8cbe2c0..6d08aad 100644
--- a/recipes-qt/meta/meta-toolchain-qt6.bb
+++ b/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"
diff --git a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb
new file mode 100644
index 0000000..997d58f
--- /dev/null
+++ b/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 \
+"
diff --git a/recipes-qt/packagegroups/packagegroup-qt6-essentials.bb b/recipes-qt/packagegroups/packagegroup-qt6-essentials.bb
new file mode 100644
index 0000000..447df08
--- /dev/null
+++ b/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 \
+"
diff --git a/recipes-qt/packagegroups/packagegroup-qt6-modules.bb b/recipes-qt/packagegroups/packagegroup-qt6-modules.bb
index 3f5337c..7a13043 100644
--- a/recipes-qt/packagegroups/packagegroup-qt6-modules.bb
+++ b/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 \
 "
diff --git a/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb
deleted file mode 100644
index 951b840..0000000
--- a/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb
+++ /dev/null
@@ -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 \
-"