Fix style issues in app recipes

Update spacing and variable ordering in the demo app recipes for
consistency per the OpenEmbedded syle guide (see:
https://www.openembedded.org/wiki/Styleguide).  Additionally,
a common cut-and-pasted unnecessary comment has been removed from
the recipes.  There are no functional changes.

Bug-AGL: SPEC-3748

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ic7cf3a1392678e76e8f512acb4f16b623fa35d3f

24 files changed, 236 insertions, 204 deletions

diff --git a/recipes-demo/alexa-viewer/alexa-viewer_git.bb b/recipes-demo/alexa-viewer/alexa-viewer_git.bb
index f73a97acb..941c334d0 100644
--- a/recipes-demo/alexa-viewer/alexa-viewer_git.bb
+++ b/recipes-demo/alexa-viewer/alexa-viewer_git.bb
@@ -7,20 +7,21 @@ LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
 DEPENDS = " \
-	qtquickcontrols2 \
-	qlibhomescreen \
-	af-binder \
-	libqtappfw \
-	wayland-native \
-	wayland \
-	qtwayland \
-	qtwayland-native \
+    qtquickcontrols2 \
+    qlibhomescreen \
+    af-binder \
+    libqtappfw \
+    wayland-native \
+    wayland \
+    qtwayland \
+    qtwayland-native \
 "
 
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/alexa-viewer;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
 inherit cmake_qt5 aglwgt
@@ -28,8 +29,8 @@ inherit cmake_qt5 aglwgt
 OECMAKE_CXX_FLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
 
 RDEPENDS_${PN} = " \
-	libqtappfw \
-	libafbwsc \
-	qlibhomescreen \
-	agl-service-voice-high-capabilities \
+    libqtappfw \
+    libafbwsc \
+    qlibhomescreen \
+    agl-service-voice-high-capabilities \
 "
diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb
index 7aba600d3..7c7d4051c 100644
--- a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb
+++ b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb
@@ -7,23 +7,25 @@ LICENSE     = "Apache-2.0 & BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \
                     file://app/cluster-gauges.qml;beginline=9;endline=48;md5=54187d50b29429abee6095fe8b7c1a78"
 
+DEPENDS = " \
+    qtquickcontrols2 qtwebsockets libqtappfw glib-2.0 \
+    wayland-native wayland qtwayland qtwayland-native \
+"
+
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-dashboard;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 qtwebsockets libqtappfw glib-2.0 \
-	    wayland-native wayland qtwayland qtwayland-native"
-
 inherit pkgconfig cmake_qt5 aglwgt
 
 RDEPENDS_${PN} += " \
-	qtquickcontrols \
-	qtquickcontrols-qmlplugins \
-	qtquickcontrols2 \
-	qtquickcontrols2-qmlplugins \
-	libqtappfw \
-	agl-service-signal-composer \
+    qtquickcontrols \
+    qtquickcontrols-qmlplugins \
+    qtquickcontrols2 \
+    qtquickcontrols2-qmlplugins \
+    libqtappfw \
+    agl-service-signal-composer \
 "
diff --git a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb b/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb
index ca18d02ea..4366bd554 100644
--- a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb
+++ b/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb
@@ -7,23 +7,23 @@ LICENSE     = "Apache-2.0 & BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \
                     file://app/cluster-gauges.qml;beginline=10;endline=49;md5=54187d50b29429abee6095fe8b7c1a78"
 
+DEPENDS = "qtquickcontrols2 qtwebsockets"
+
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-gauges;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 qtwebsockets"
-
 inherit pkgconfig cmake_qt5 aglwgt
 
 RDEPENDS_${PN} += " \
-	qtquickcontrols \
-	qtquickcontrols-qmlplugins \
-	qtquickcontrols2 \
-	qtquickcontrols2-qmlplugins \
-	qtwebsockets \
-	qtwebsockets-qmlplugins \
-	kms-conf \
+    qtquickcontrols \
+    qtquickcontrols-qmlplugins \
+    qtquickcontrols2 \
+    qtquickcontrols2-qmlplugins \
+    qtwebsockets \
+    qtwebsockets-qmlplugins \
+    kms-conf \
 "
diff --git a/recipes-demo/cluster-receiver/cluster-receiver_git.bb b/recipes-demo/cluster-receiver/cluster-receiver_git.bb
index a698428e0..86c2f79b7 100644
--- a/recipes-demo/cluster-receiver/cluster-receiver_git.bb
+++ b/recipes-demo/cluster-receiver/cluster-receiver_git.bb
@@ -6,20 +6,22 @@ SECTION     = "apps"
 LICENSE     = "Apache-2.0 & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=374fee6a7817f1e1a5a7bfb7b7989553"
 
+DEPENDS = " \
+    wayland wayland-native \
+    gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad \
+"
+
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-receiver;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS += "wayland wayland-native \
-	    gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
-
 inherit cmake pkgconfig aglwgt
 
 RDEPENDS_${PN} += " \
-	gstreamer1.0-plugins-base \
-	gstreamer1.0-plugins-good \
-	gstreamer1.0-plugins-bad \
+    gstreamer1.0-plugins-base \
+    gstreamer1.0-plugins-good \
+    gstreamer1.0-plugins-bad \
 "
diff --git a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb
index 9c9759618..a0fde07e1 100644
--- a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb
+++ b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb
@@ -7,22 +7,24 @@ LICENSE     = "Apache-2.0 & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \
                     file://app/surface.hpp;beginline=5;endline=21;md5=5351c531a191f0e3463aafcd0a6a00a3"
 
+DEPENDS = " \
+    wayland wayland-native \
+    qtwayland qtwayland-native \
+    qtquickcontrols2 qtwebsockets qtbase qtdeclarative \
+    gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad \
+"
+
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-qt-cluster-demo-receiver;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS += "wayland wayland-native \
-	    qtwayland qtwayland-native \
-	    qtquickcontrols2 qtwebsockets qtbase qtdeclarative \
-	    gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
-
 inherit cmake_qt5 pkgconfig aglwgt
 
 RDEPENDS_${PN} += " \
-	gstreamer1.0-plugins-base \
-	gstreamer1.0-plugins-good \
-	gstreamer1.0-plugins-bad \
+    gstreamer1.0-plugins-base \
+    gstreamer1.0-plugins-good \
+    gstreamer1.0-plugins-bad \
 "
diff --git a/recipes-demo/dashboard/dashboard_git.bb b/recipes-demo/dashboard/dashboard_git.bb
index f19eb1fc3..64031d5e8 100644
--- a/recipes-demo/dashboard/dashboard_git.bb
+++ b/recipes-demo/dashboard/dashboard_git.bb
@@ -6,18 +6,18 @@ SECTION     = "apps"
 LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
+DEPENDS = "qtquickcontrols2 qttools-native libqtappfw"
+
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/dashboard;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 qttools-native libqtappfw"
-
 inherit qmake5 aglwgt
 
 RDEPENDS_${PN} += " \
-	libqtappfw \
-	agl-service-signal-composer \
+    libqtappfw \
+    agl-service-signal-composer \
 "
diff --git a/recipes-demo/homescreen/homescreen_git.bb b/recipes-demo/homescreen/homescreen_git.bb
index 92c245836..2940378a4 100644
--- a/recipes-demo/homescreen/homescreen_git.bb
+++ b/recipes-demo/homescreen/homescreen_git.bb
@@ -5,33 +5,34 @@ LICENSE     = "Apache-2.0"
 SECTION     = "apps"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
-DEPENDS = "\
-        qtbase \
-        qtdeclarative \
-        qtquickcontrols2 \
-        agl-service-homescreen \
-        agl-service-weather \
-        libqtappfw \
-        libhomescreen \
-        libafb-helpers-qt \
-        wayland-native \
-        wayland \
-        qtwayland \
-        qtwayland-native \
+DEPENDS = " \
+    qtbase \
+    qtdeclarative \
+    qtquickcontrols2 \
+    agl-service-homescreen \
+    agl-service-weather \
+    libqtappfw \
+    libhomescreen \
+    libafb-helpers-qt \
+    wayland-native \
+    wayland \
+    qtwayland \
+    qtwayland-native \
 "
 
-inherit qmake5 systemd pkgconfig aglwgt
+PV      = "1.0+git${SRCPV}"
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/homescreen;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV      = "1.0+git${SRCPV}"
 S       = "${WORKDIR}/git/"
 
+inherit qmake5 systemd pkgconfig aglwgt
+
 PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
 
 OE_QMAKE_CXXFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
 
 RDEPENDS_${PN} += " \
-        libqtappfw \
+    libqtappfw \
 "
diff --git a/recipes-demo/hvac/hvac_git.bb b/recipes-demo/hvac/hvac_git.bb
index 2094652ab..ed2cce7e8 100644
--- a/recipes-demo/hvac/hvac_git.bb
+++ b/recipes-demo/hvac/hvac_git.bb
@@ -6,17 +6,20 @@ SECTION     = "apps"
 LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
+DEPENDS = " \
+    qtquickcontrols2 \
+    libhomescreen \
+    qttools-native \
+    libqtappfw \
+"
+
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/hvac;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 libhomescreen \
-            qttools-native \
-            libqtappfw"
+inherit qmake5 aglwgt
 
 RDEPENDS_${PN} = "agl-service-hvac libqtappfw"
-
-inherit qmake5 aglwgt
diff --git a/recipes-demo/launcher/launcher_git.bb b/recipes-demo/launcher/launcher_git.bb
index 5b1de0134..1f2117e62 100644
--- a/recipes-demo/launcher/launcher_git.bb
+++ b/recipes-demo/launcher/launcher_git.bb
@@ -17,12 +17,13 @@ DEPENDS = "\
         qtwayland-native \
 "
 
-inherit qmake5 systemd pkgconfig aglwgt
+PV      = "1.0+git${SRCPV}"
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/launcher;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV      = "1.0+git${SRCPV}"
 S       = "${WORKDIR}/git/"
 
+inherit qmake5 systemd pkgconfig aglwgt
+
 PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
diff --git a/recipes-demo/mediaplayer/mediaplayer_git.bb b/recipes-demo/mediaplayer/mediaplayer_git.bb
index 08990dc45..aa809360c 100644
--- a/recipes-demo/mediaplayer/mediaplayer_git.bb
+++ b/recipes-demo/mediaplayer/mediaplayer_git.bb
@@ -6,19 +6,20 @@ SECTION     = "apps"
 LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
+DEPENDS = " \
+    qtquickcontrols2 \
+    qtwebsockets \
+    libqtappfw \
+    libhomescreen \
+"
+
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mediaplayer;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 \
-            qtwebsockets \
-            libqtappfw \
-            libhomescreen \
-"
-
 inherit qmake5 aglwgt
 
 RDEPENDS_${PN} += "agl-service-mediaplayer libqtappfw"
diff --git a/recipes-demo/messaging/messaging_git.bb b/recipes-demo/messaging/messaging_git.bb
index fbdff55fd..f440ca89b 100644
--- a/recipes-demo/messaging/messaging_git.bb
+++ b/recipes-demo/messaging/messaging_git.bb
@@ -6,18 +6,19 @@ SECTION     = "apps"
 LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
+DEPENDS = " \
+    qtquickcontrols2 \
+    libqtappfw \
+    libhomescreen \
+"
+
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/messaging;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 \
-            libqtappfw \
-            libhomescreen \
-"
-
 inherit qmake5 aglwgt
 
 RDEPENDS_${PN} += "agl-service-bluetooth-map libqtappfw"
diff --git a/recipes-demo/mixer/mixer_git.bb b/recipes-demo/mixer/mixer_git.bb
index 930e79210..2ccd111d7 100644
--- a/recipes-demo/mixer/mixer_git.bb
+++ b/recipes-demo/mixer/mixer_git.bb
@@ -6,23 +6,24 @@ SECTION     = "apps"
 LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mixer;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
+DEPENDS = " \
+    qtquickcontrols2 \
+    qtwebsockets \
+    libafb-helpers-qt \
+"
 
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
+PROVIDES += "virtual/mixer"
 
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 \
-            qtwebsockets \
-            libafb-helpers-qt \
-"
+PV = "1.0+git${SRCPV}"
 
-RDEPENDS_${PN} += "agl-service-audiomixer"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mixer;protocol=https;branch=${AGL_BRANCH}"
+SRCREV  = "${AGL_APP_REVISION}"
 
-PROVIDES += "virtual/mixer"
-RPROVIDES_${PN} += "virtual/mixer"
+S  = "${WORKDIR}/git"
 
 inherit cmake_qt5 aglwgt
 
 OECMAKE_CXX_FLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
+
+RDEPENDS_${PN} = "agl-service-audiomixer"
+RPROVIDES_${PN} += "virtual/mixer"
diff --git a/recipes-demo/navigation/ondemandnavi_git.bb b/recipes-demo/navigation/ondemandnavi_git.bb
index 98cd526bc..79d96a0e2 100644
--- a/recipes-demo/navigation/ondemandnavi_git.bb
+++ b/recipes-demo/navigation/ondemandnavi_git.bb
@@ -6,10 +6,11 @@ SECTION     = "apps"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
-DEPENDS += "qtquickcontrols2 \
-            qlibhomescreen \
-            qtlocation \
-            libqtappfw \
+DEPENDS = " \
+    qtquickcontrols2 \
+    qlibhomescreen \
+    qtlocation \
+    libqtappfw \
 "
 
 PV = "1.0+git${SRCPV}"
@@ -21,12 +22,13 @@ S = "${WORKDIR}/git"
 
 inherit qmake5 aglwgt pkgconfig
 
-RDEPENDS_${PN} += "qtlocation \
-                   flite \
-                   libqtappfw \
-                   openjtalk \
-                   gstreamer1.0 \
-                   ondemandnavi-config \
+RDEPENDS_${PN} += " \
+    qtlocation \
+    flite \
+    libqtappfw \
+    openjtalk \
+    gstreamer1.0 \
+    ondemandnavi-config \
 "
 
 RPROVIDES_${PN} = "virtual/navigation"
diff --git a/recipes-demo/navigation/poiapp_git.bb b/recipes-demo/navigation/poiapp_git.bb
index 2942bf07c..55d1142d8 100644
--- a/recipes-demo/navigation/poiapp_git.bb
+++ b/recipes-demo/navigation/poiapp_git.bb
@@ -6,10 +6,12 @@ SECTION     = "apps"
 LICENSE          = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4ee23c52855c222cba72583d301d2338"
 
-DEPENDS += "qtbase json-c \
-            libhomescreen \
-            libqtappfw \
-           "
+DEPENDS = " \
+    qtbase \
+    json-c \
+    libhomescreen \
+    libqtappfw \
+"
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/poi-yelp;protocol=https;branch=${AGL_BRANCH}"
 SRCREV = "${AGL_APP_REVISION}"
@@ -18,4 +20,4 @@ S = "${WORKDIR}/git"
 
 inherit cmake_qt5 pkgconfig aglwgt
 
-RDEPENDS_${PN} =  "qtbase libqtappfw"
+RDEPENDS_${PN} = "qtbase libqtappfw"
diff --git a/recipes-demo/navigation/tbtnavi_git.bb b/recipes-demo/navigation/tbtnavi_git.bb
index d2e8e633e..0965eb982 100644
--- a/recipes-demo/navigation/tbtnavi_git.bb
+++ b/recipes-demo/navigation/tbtnavi_git.bb
@@ -11,13 +11,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \
                     file://include/mapbox/recursive_wrapper.hpp;beginline=4;endline=13;md5=cd3341aae76c0cf8345935abd20f0051 \
 "
 
-DEPENDS += "qtbase \
-            qtquickcontrols2 \
-            qlibhomescreen \
-            qtlocation \
-            libqtappfw \
-            wayland-native \
-            qtwayland-native \
+DEPENDS = " \
+    qtbase \
+    qtquickcontrols2 \
+    qlibhomescreen \
+    qtlocation \
+    libqtappfw \
+    wayland-native \
+    qtwayland-native \
 "
 
 PV = "1.0+git${SRCPV}"
@@ -29,8 +30,9 @@ S = "${WORKDIR}/git"
 
 inherit qmake5 aglwgt pkgconfig
 
-RDEPENDS_${PN} += "qtlocation \
-                   ondemandnavi-config \
-                   agl-service-navigation \
-                   libqtappfw \
+RDEPENDS_${PN} += " \
+    qtlocation \
+    ondemandnavi-config \
+    agl-service-navigation \
+    libqtappfw \
 "
diff --git a/recipes-demo/onscreenapp/onscreenapp_git.bb b/recipes-demo/onscreenapp/onscreenapp_git.bb
index 5278aaf42..32a7a2db3 100644
--- a/recipes-demo/onscreenapp/onscreenapp_git.bb
+++ b/recipes-demo/onscreenapp/onscreenapp_git.bb
@@ -6,13 +6,13 @@ SECTION     = "apps"
 LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
+DEPENDS = "qtquickcontrols2 libhomescreen qlibhomescreen"
+
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/onscreenapp;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 libhomescreen qlibhomescreen"
-
 inherit qmake5 aglwgt
diff --git a/recipes-demo/phone/phone_git.bb b/recipes-demo/phone/phone_git.bb
index dd8672274..41ca0e616 100644
--- a/recipes-demo/phone/phone_git.bb
+++ b/recipes-demo/phone/phone_git.bb
@@ -6,19 +6,24 @@ SECTION     = "apps"
 LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/phone;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
+DEPENDS = " \
+    qtquickcontrols2 \
+    libqtappfw \
+    libhomescreen \
+    gstreamer1.0 \
+"
 
 PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 \
-            libqtappfw \
-            libhomescreen \
-            gstreamer1.0 \
-"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/phone;protocol=https;branch=${AGL_BRANCH}"
+SRCREV  = "${AGL_APP_REVISION}"
+
+S = "${WORKDIR}/git"
 
 inherit qmake5 aglwgt
 
-RDEPENDS_${PN} += "agl-service-telephony agl-service-bluetooth-pbap libqtappfw"
+RDEPENDS_${PN} += " \
+    agl-service-telephony \
+    agl-service-bluetooth-pbap \
+    libqtappfw \
+"
diff --git a/recipes-demo/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb b/recipes-demo/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb
index e9e8b2b37..605c4cebf 100644
--- a/recipes-demo/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb
+++ b/recipes-demo/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb
@@ -14,15 +14,15 @@ S = "${WORKDIR}/git/"
 
 inherit qmake5
 
-FILES_${PN} += "${OE_QMAKE_PATH_QML}/QtQuick/Controls.2/AGL/*"
-
-RDEPENDS_${PN} += " \
-	qtquickcontrols-qmlplugins \
-	qtquickcontrols2-qmlplugins \
-	qtsvg-plugins \
-"
-
 do_install_append_class-target() {
     install -d ${D}/${sysconfdir}/afm/unit.env.d
     echo "QT_QUICK_CONTROLS_STYLE=AGL" > ${D}${sysconfdir}/afm/unit.env.d/qtquickcontrols2-style
 }
+
+FILES_${PN} += "${OE_QMAKE_PATH_QML}/QtQuick/Controls.2/AGL/*"
+
+RDEPENDS_${PN} += " \
+    qtquickcontrols-qmlplugins \
+    qtquickcontrols2-qmlplugins \
+    qtsvg-plugins \
+"
diff --git a/recipes-demo/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb b/recipes-demo/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb
index 0a432db0e..faab2214e 100644
--- a/recipes-demo/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb
+++ b/recipes-demo/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb
@@ -17,7 +17,7 @@ inherit qmake5
 FILES_${PN} += "${OE_QMAKE_PATH_QML}/AGL/Demo/Controls/*"
 
 RDEPENDS_${PN} += " \
-	qtquickcontrols-qmlplugins \
-	qtquickcontrols2-qmlplugins \
-	qtsvg-plugins \
+    qtquickcontrols-qmlplugins \
+    qtquickcontrols2-qmlplugins \
+    qtsvg-plugins \
 "
diff --git a/recipes-demo/radio/radio_git.bb b/recipes-demo/radio/radio_git.bb
index cba376cd6..5d0b9fbe2 100644
--- a/recipes-demo/radio/radio_git.bb
+++ b/recipes-demo/radio/radio_git.bb
@@ -6,6 +6,10 @@ SECTION     = "apps"
 LICENSE     = "Apache-2.0 & GPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
+DEPENDS = "qtquickcontrols2 rtl-sdr libhomescreen libqtappfw"
+
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/radio;protocol=https;branch=${AGL_BRANCH} \
            file://presets-ALS.conf \
            file://presets-CES.conf \
@@ -13,13 +17,8 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/radio;protocol=https;bra
 "
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS = "qtquickcontrols2 rtl-sdr"
-DEPENDS += "libhomescreen libqtappfw"
-
 inherit qmake5 aglwgt
 
 # ALS, CES, FOSDEM available
diff --git a/recipes-demo/settings/settings_git.bb b/recipes-demo/settings/settings_git.bb
index 6486b0362..24ab47aed 100644
--- a/recipes-demo/settings/settings_git.bb
+++ b/recipes-demo/settings/settings_git.bb
@@ -6,22 +6,26 @@ SECTION     = "apps"
 LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
+DEPENDS = " \
+    libqtappfw \
+    qtquickcontrols2 \
+    qt-qrcode \
+    libhomescreen \
+    qtvirtualkeyboard \
+"
+
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/settings;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS += "libqtappfw qtquickcontrols2 qt-qrcode"
-DEPENDS += "libhomescreen qtvirtualkeyboard"
+inherit qmake5 aglwgt
 
-# runtime dependencies
 RDEPENDS_${PN} += " \
-	qt-qrcode \
-	agl-service-bluetooth \
-	agl-service-network \
-	libqtappfw \
+    qt-qrcode \
+    agl-service-bluetooth \
+    agl-service-network \
+    libqtappfw \
 "
-
-inherit qmake5 aglwgt
diff --git a/recipes-demo/taskmanager/taskmanager_git.bb b/recipes-demo/taskmanager/taskmanager_git.bb
index 19c9fd6f9..9b96c868f 100644
--- a/recipes-demo/taskmanager/taskmanager_git.bb
+++ b/recipes-demo/taskmanager/taskmanager_git.bb
@@ -6,20 +6,21 @@ SECTION     = "apps"
 LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
+DEPENDS = " \
+    qtquickcontrols2 \
+    qtwebsockets \
+    qtcharts \
+    libqtappfw \
+    libhomescreen \
+"
+
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/taskmanager;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 \
-            qtwebsockets \
-            qtcharts \
-            libqtappfw \
-            libhomescreen \
-"
-
 inherit qmake5 aglwgt
 
 RDEPENDS_${PN} += "agl-service-taskmanager libqtappfw"
diff --git a/recipes-demo/telematics-recorder/telematics-recorder_git.bb b/recipes-demo/telematics-recorder/telematics-recorder_git.bb
index 2c2ee1767..5f8a464e4 100644
--- a/recipes-demo/telematics-recorder/telematics-recorder_git.bb
+++ b/recipes-demo/telematics-recorder/telematics-recorder_git.bb
@@ -6,20 +6,20 @@ SECTION     = "apps"
 LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
+DEPENDS = "glib-2.0 mosquitto"
+
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-telematics-demo-recorder;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AUTOREV}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS = "glib-2.0 mosquitto"
-
 inherit cmake aglwgt
 
 RDEPENDS_${PN} += " \
-	agl-service-can-low-level \
-	agl-service-gps \
-	agl-service-network \
-	libmosquitto1 \
+    agl-service-can-low-level \
+    agl-service-gps \
+    agl-service-network \
+    libmosquitto1 \
 "
diff --git a/recipes-demo/waltham-receiver/waltham-receiver_git.bb b/recipes-demo/waltham-receiver/waltham-receiver_git.bb
index 670ca8ba4..794b2def1 100644
--- a/recipes-demo/waltham-receiver/waltham-receiver_git.bb
+++ b/recipes-demo/waltham-receiver/waltham-receiver_git.bb
@@ -6,21 +6,23 @@ SECTION     = "apps"
 LICENSE     = "Apache-2.0 & MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=374fee6a7817f1e1a5a7bfb7b7989553"
 
+DEPENDS = " \
+    waltham wayland wayland-native \
+    gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad \
+"
+
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/waltham-receiver.git;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
 
-PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
-# build-time dependencies
-DEPENDS += "waltham wayland wayland-native \
-	    gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
-
 inherit cmake pkgconfig aglwgt
 
 RDEPENDS_${PN} += " \
-	gstreamer1.0-plugins-base \
-	gstreamer1.0-plugins-good \
-	gstreamer1.0-plugins-bad \
-	waltham \
+    gstreamer1.0-plugins-base \
+    gstreamer1.0-plugins-good \
+    gstreamer1.0-plugins-bad \
+    waltham \
 "