From a0549dd5c5603b06dfb1ab6843e740a5981f120b Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Fri, 30 Oct 2015 15:55:24 +0200
Subject: qt5: add qt addons dev packages to the toolchain

packagegroup-b2qt-embedded-qt5-addons-toolchain-target was never
included in the toolchain.

Change-Id: I18b08c1ba1a1a663488fd2cde960d35c43dbb208
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 ...up-b2qt-embedded-qt5-addons-toolchain-target.bb | 37 ----------------------
 ...kagegroup-b2qt-embedded-qt5-toolchain-target.bb |  8 ++++-
 2 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb

diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb
deleted file mode 100644
index f009340..0000000
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://www.qt.io/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-DESCRIPTION = "Qt5 addons toolchain packages"
-LICENSE = "QtEnterprise"
-
-inherit packagegroup
-
-PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
-
-RDEPENDS_${PN} += " \
-    qtdatavisualization-dev \
-    qtenterprisecontrols-dev \
-    qtcharts-dev \
-    qtvirtualkeyboard-dev \
-    qtquickcompiler-dev \
-    b2qt-utils-dev \
-    "
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 ccc78a4..06c1c79 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -33,6 +33,7 @@ MACHINE_EXTRA_INSTALL_QT_SDK ?= ""
 RDEPENDS_${PN} += " \
     ${MACHINE_EXTRA_INSTALL_QT_SDK} \
     packagegroup-b2qt-embedded-toolchain-target \
+    \
     qt3d-dev \
     qtbase-dev \
     qtbase-staticdev \
@@ -44,6 +45,7 @@ RDEPENDS_${PN} += " \
     qtimageformats-dev \
     qtlocation-dev \
     qtmultimedia-dev \
+    qtquickcontrols-dev \
     qtsensors-dev \
     qtserialport-dev \
     qtsvg-dev \
@@ -54,5 +56,9 @@ RDEPENDS_${PN} += " \
     qtwebsockets-dev \
     qtwebchannel-dev \
     qtxmlpatterns-dev \
-    qtquickcontrols-dev \
+    \
+    b2qt-utils-dev \
+    qtcharts-dev \
+    qtdatavisualization-dev \
+    qtvirtualkeyboard-dev \
     "
-- 
cgit v1.2.3-54-g00ecf