qtermwidget and qterminal became members of lxqt

[1] http://sourceforge.net/p/lxde/mailman/message/34596414/

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

recipes-lxqt/packagegroups/lxqt-world.bb

@@ -27,4 +27,6 @@ RDEPENDS_${PN} = " \
     menu-cache \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "obconf-qt", "",d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pcmanfm-qt", "",d)} \
+    qtermwidget \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qterminal", "",d)} \
 "

recipes-lxqt/packagegroups/packagegroup-lxqt-base.bb

@@ -10,7 +10,6 @@ RDEPENDS_${PN} = " \
     qtimageformats-plugins \
     \
     lxqt-world \
-    qterminal-world \
     oxygen-icons \
     \
     openbox \

recipes-lxqt/qterminal/qterminal_git.bb

@@ -8,7 +8,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 DEPENDS = "qtbase qttools-native qtermwidget"
 
-SRC_URI = "git://github.com/qterminal/${BPN}.git"
+SRC_URI = "git://github.com/lxde/${BPN}.git"
 SRCREV = "7f2c9e03e193df4d98cfb665d2acfa45e7153d91"
 PV = "0.6.0+git${SRCPV}"
 

recipes-lxqt/qtermwidget/qtermwidget_git.bb

@@ -6,7 +6,7 @@ inherit cmake_qt5 cmake-lib cmake-extra-sanity
 
 DEPENDS = "qtbase"
 
-SRC_URI = "git://github.com/qterminal/${BPN}.git"
+SRC_URI = "git://github.com/lxde/${BPN}.git"
 SRCREV = "72ffc262eb6cd5deaf3489068f7fe6a91f734998"
 PV = "0.6.0+git${SRCPV}"
 

recipes-misc/recipes-qterminal/packagegroups/qterminal-world.bb

@@ -1,10 +0,0 @@
-SUMMARY = "QTerminal collection"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
-
-inherit packagegroup
-
-RDEPENDS_${PN} = " \
-    qtermwidget \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qterminal", "",d)} \
-"

recipes-support/packagegroups/meta-qt5-extra-world.bb

@@ -11,6 +11,5 @@ RDEPENDS_${PN} = " \
     hexalate \
     kde-world \
     lxqt-world \
-    qterminal-world \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "sddm", "",d)} \
 "