Rename last references to b2qt-utils

Change-Id: I4b204b6dea02fd3e298eb66028b44139eb12ff2a
Reviewed-by: Risto Avila <risto.avila@qt.io>

4 files changed, 6 insertions, 8 deletions

diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index 25a567d..391224e 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -36,7 +36,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} += " \
     b2qt-appcontroller \
-    b2qt-utils \
     qtivi \
     neptune-ui \
     neptune-ui-apps \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 9c2008d..3d60eed 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -36,7 +36,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} += " \
     b2qt-appcontroller \
-    b2qt-utils \
     b2qt-launcher \
     b2qt-demos \
     ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index 652c931..ec3125b 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -44,11 +44,14 @@ RDEPENDS_${PN} += " \
     qt3d-dev \
     qtbase-dev \
     qtbase-staticdev \
-    qtcanvas3d \
+    qtcanvas3d-dev \
+    qtcharts-dev \
     qtconnectivity-dev \
+    qtdatavis3d-dev \
     qtdeclarative-dev \
     qtdeclarative-render2d-dev \
     qtdeclarative-staticdev \
+    qtdeviceutilities-dev \
     qtgraphicaleffects-dev \
     qtimageformats-dev \
     qtlocation-dev \
@@ -62,14 +65,10 @@ RDEPENDS_${PN} += " \
     qtsvg-dev \
     qttools-dev \
     qttools-staticdev \
+    qtvirtualkeyboard-dev \
     ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \
     ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \
     qtwebsockets-dev \
     qtwebchannel-dev \
     qtxmlpatterns-dev \
-    \
-    b2qt-utils-dev \
-    qtcharts-dev \
-    qtdatavis3d-dev \
-    qtvirtualkeyboard-dev \
     "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 8138b3e..c63ddb8 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -44,6 +44,7 @@ RDEPENDS_${PN} += " \
     qtdeclarative \
     qtdeclarative-render2d \
     qtdeclarative-tools \
+    qtdeviceutilities \
     qtgraphicaleffects \
     qtimageformats \
     qtlocation \