40 files changed, 10 insertions, 14 deletions

diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index bb2e4de..73695fc 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -35,13 +35,13 @@ inherit packagegroup
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} += " \
-    b2qt-appcontroller \
+    boot2qt-appcontroller \
     qtivi \
     neptune-ui \
     neptune-ui-apps \
     ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebbrowser', '', d)} \
     gammaray \
-    qmllive-target \
+    qmllive \
     multiscreen-demo \
-    qdbd \
+    qdb \
     "
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 1fdbcf3..345fbaa 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -35,9 +35,9 @@ inherit packagegroup
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} += " \
-    b2qt-appcontroller \
-    b2qt-launcher \
-    b2qt-demos \
+    boot2qt-appcontroller \
+    boot2qt-launcher \
+    boot2qt-demos \
     ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
-    qdbd \
+    qdb \
     "
diff --git a/meta-boot2qt/recipes-core/ostree/ostree.bb b/meta-boot2qt/recipes-core/ostree/ostree_git.bb
index e4c8076..e4c8076 100644
--- a/meta-boot2qt/recipes-core/ostree/ostree.bb
+++ b/meta-boot2qt/recipes-core/ostree/ostree_git.bb
diff --git a/meta-boot2qt/recipes-graphics/fonts/ttf-opensans.bb b/meta-boot2qt/recipes-graphics/fonts/ttf-opensans_git.bb
index 1d581ac..1d581ac 100644
--- a/meta-boot2qt/recipes-graphics/fonts/ttf-opensans.bb
+++ b/meta-boot2qt/recipes-graphics/fonts/ttf-opensans_git.bb
diff --git a/meta-boot2qt/recipes-graphics/hunspell/hunspell-dicts.bb b/meta-boot2qt/recipes-graphics/hunspell/hunspell-dicts_git.bb
index 92fd300..92fd300 100644
--- a/meta-boot2qt/recipes-graphics/hunspell/hunspell-dicts.bb
+++ b/meta-boot2qt/recipes-graphics/hunspell/hunspell-dicts_git.bb
diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive-target/qmllive-target.patch b/meta-boot2qt/recipes-qt/automotive/qmllive/qmllive-target.patch
index e3f81fa..e3f81fa 100644
--- a/meta-boot2qt/recipes-qt/automotive/qmllive-target/qmllive-target.patch
+++ b/meta-boot2qt/recipes-qt/automotive/qmllive/qmllive-target.patch
diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive-target_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
index 54f1188..ce1bb82 100644
--- a/meta-boot2qt/recipes-qt/automotive/qmllive-target_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
@@ -36,7 +36,6 @@ inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
 
 QT_GIT_PROJECT = "qt-apps"
-QT_MODULE = "qmllive"
 QT_MODULE_BRANCH = "master"
 
 SRC_URI += " \
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/appcontroller.conf
index 1ef3732..1ef3732 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/appcontroller.conf
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/colibri-vf/appcontroller.conf
index 4fa1931..4fa1931 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/colibri-vf/appcontroller.conf
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/emulator/appcontroller.conf
index 2bc6eca..2bc6eca 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/emulator/appcontroller.conf
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx6/appcontroller.conf
index 4e3415f..4e3415f 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx6/appcontroller.conf
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx7/appcontroller.conf
index b27315e..b27315e 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx7/appcontroller.conf
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/rpi/appcontroller.conf
index 0915343..0915343 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/rpi/appcontroller.conf
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/tegra-t18x/appcontroller.conf
index 21bb44c..21bb44c 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/tegra-t18x/appcontroller.conf
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/ti33x/appcontroller.conf
index 37284de..37284de 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/ti33x/appcontroller.conf
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb
index 9c52606..82f02be 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb
@@ -34,10 +34,9 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=f25c7436dbc72d4719a5684b28dbcf4b;beginli
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
 
-SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/boot2qt-appcontroller;${QT_MODULE_BRANCH_PARAM};protocol=http \
-    file://appcontroller.conf \
-    "
+QT_GIT_PROJECT = "qt-apps"
+
+SRC_URI += "file://appcontroller.conf"
 
 SRCREV = "5ab7fdbf0845c40418272bafa565295511055d3b"
 
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-demos.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
index 3726482..3726482 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/b2qt-startup.sh
index 89e4bbb..89e4bbb 100755
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/b2qt-startup.sh
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/b2qt.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/b2qt.service
index f941f91..f941f91 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/b2qt.service
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/b2qt.service
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/b2qt.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/beaglebone/b2qt.service
index cdf6480..cdf6480 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/b2qt.service
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/beaglebone/b2qt.service
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/qtlauncher.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/beaglebone/qtlauncher.service
index 1094675..1094675 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/qtlauncher.service
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/beaglebone/qtlauncher.service
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/emulator/b2qt.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/emulator/b2qt.service
index 65fba92..65fba92 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/emulator/b2qt.service
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/emulator/b2qt.service
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/emulator/qtlauncher.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/emulator/qtlauncher.service
index 2b02c87..2b02c87 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/emulator/qtlauncher.service
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/emulator/qtlauncher.service
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/qtlauncher.service b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/qtlauncher.service
index 7658ca8..7658ca8 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher/qtlauncher.service
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher/qtlauncher.service
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
index 225079d..e77d7b2 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
@@ -35,7 +35,6 @@ inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
 
 QT_GIT_PROJECT = "qt-apps"
-QT_MODULE = "boot2qt-launcher"
 
 SRC_URI += " \
     file://b2qt-startup.sh \
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/democompositor_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/democompositor_git.bb
index 3d9a196..3d9a196 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/democompositor_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/democompositor_git.bb
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/b2qt-gadget-network.sh b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/b2qt-gadget-network.sh
index 3161db7..3161db7 100755
--- a/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/b2qt-gadget-network.sh
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/b2qt-gadget-network.sh
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/defaults b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/defaults
index 5ced90d..5ced90d 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/defaults
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/defaults
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd-init.sh
index 15981b0..15981b0 100755
--- a/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd-init.sh
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/qdbd.service b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd.service
index be8e701..be8e701 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/qdbd/qdbd.service
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd.service
diff --git a/meta-boot2qt/recipes-qt/b2qt-addons/qdbd.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb
index 8057e19..5615473 100644
--- a/meta-boot2qt/recipes-qt/b2qt-addons/qdbd.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb
@@ -37,7 +37,6 @@ inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
 
 QT_GIT_PROJECT = "qt-apps"
-QT_MODULE = "qdb"
 QT_MODULE_BRANCH = "5.9"
 
 SRC_URI += "file://b2qt-gadget-network.sh \
diff --git a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities.bb b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
index 7405424..7405424 100644
--- a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
diff --git a/meta-boot2qt/recipes-qt/qt5/qtglesstream.bb b/meta-boot2qt/recipes-qt/qt5/qtglesstream_git.bb
index 0f942e7..0f942e7 100644
--- a/meta-boot2qt/recipes-qt/qt5/qtglesstream.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtglesstream_git.bb
diff --git a/meta-boot2qt/recipes-qt/qt5/qtotaupdate.bb b/meta-boot2qt/recipes-qt/qt5/qtotaupdate_git.bb
index 495598a..495598a 100644
--- a/meta-boot2qt/recipes-qt/qt5/qtotaupdate.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtotaupdate_git.bb
diff --git a/meta-intel-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf
index ca5f455..ca5f455 100644
--- a/meta-intel-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf
+++ b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf
diff --git a/meta-intel-extras/recipes/qt5/b2qt-appcontroller/kms.conf b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/kms.conf
index d6da06c..d6da06c 100644
--- a/meta-intel-extras/recipes/qt5/b2qt-appcontroller/kms.conf
+++ b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/kms.conf
diff --git a/meta-intel-extras/recipes/qt5/b2qt-appcontroller.bbappend b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend
index 708ed85..708ed85 100644
--- a/meta-intel-extras/recipes/qt5/b2qt-appcontroller.bbappend
+++ b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend
diff --git a/meta-renesas-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf
index 2b4919d..2b4919d 100644
--- a/meta-renesas-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf
+++ b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf
diff --git a/meta-renesas-extras/recipes/qt5/b2qt-appcontroller/kms.conf b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/kms.conf
index db7a503..db7a503 100644
--- a/meta-renesas-extras/recipes/qt5/b2qt-appcontroller/kms.conf
+++ b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/kms.conf
diff --git a/meta-renesas-extras/recipes/qt5/b2qt-appcontroller.bbappend b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend
index 708ed85..708ed85 100644
--- a/meta-renesas-extras/recipes/qt5/b2qt-appcontroller.bbappend
+++ b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend