summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2020-05-14 17:12:48 +0300
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-06-24 13:47:22 +0200
commit9934769b4bb8446bd87aff46cb86041f500ee888 (patch)
treef5138f57467d388ba7a97f8148d1a5a7b93f02ff
parent3e09fd4fbea32961626e935a2470422917d9236d (diff)
recipes-demo-hmi: Remove qtaglextras and *-windowmanager depends
Bug-AGL: SPEC-3342 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: I3a5e73e30cae02c97d7d0ab6ca041b32a8862e73
-rw-r--r--recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb2
-rw-r--r--recipes-demo-hmi/dashboard/dashboard_git.bb2
-rw-r--r--recipes-demo-hmi/homescreen/homescreen_git.bb2
-rw-r--r--recipes-demo-hmi/hvac/hvac_git.bb5
-rw-r--r--recipes-demo-hmi/launcher/launcher_git.bb1
-rw-r--r--recipes-demo-hmi/mediaplayer/mediaplayer_git.bb1
-rw-r--r--recipes-demo-hmi/messaging/messaging_git.bb1
-rw-r--r--recipes-demo-hmi/mixer/mixer_git.bb1
-rw-r--r--recipes-demo-hmi/navigation/navigation-demo_git.bb1
-rw-r--r--recipes-demo-hmi/navigation/ondemandnavi_git.bb2
-rw-r--r--recipes-demo-hmi/navigation/poiapp_git.bb2
-rw-r--r--recipes-demo-hmi/navigation/tbtnavi_git.bb1
-rw-r--r--recipes-demo-hmi/onscreenapp/onscreenapp_git.bb2
-rw-r--r--recipes-demo-hmi/phone/phone_git.bb1
-rw-r--r--recipes-demo-hmi/radio/radio_git.bb2
-rw-r--r--recipes-demo-hmi/settings/settings_git.bb2
-rw-r--r--recipes-demo-hmi/taskmanager/taskmanager_git.bb1
17 files changed, 8 insertions, 21 deletions
diff --git a/recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb b/recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb
index f98704eed..d406d8539 100644
--- a/recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb
+++ b/recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
DEPENDS = " \
qtquickcontrols2 \
- qlibwindowmanager \
qlibhomescreen \
af-binder \
libqtappfw \
@@ -27,7 +26,6 @@ OECMAKE_CXX_FLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel'
RDEPENDS_${PN} = " \
libqtappfw \
libafbwsc \
- qlibwindowmanager \
qlibhomescreen \
agl-service-voice-high-capabilities \
"
diff --git a/recipes-demo-hmi/dashboard/dashboard_git.bb b/recipes-demo-hmi/dashboard/dashboard_git.bb
index 822207b17..70a8793d2 100644
--- a/recipes-demo-hmi/dashboard/dashboard_git.bb
+++ b/recipes-demo-hmi/dashboard/dashboard_git.bb
@@ -13,7 +13,7 @@ PV = "1.0+git${SRCPV}"
S = "${WORKDIR}/git"
# build-time dependencies
-DEPENDS += "qtquickcontrols2 qttools-native qtaglextras libqtappfw"
+DEPENDS += "qtquickcontrols2 qttools-native libqtappfw"
inherit qmake5 aglwgt
diff --git a/recipes-demo-hmi/homescreen/homescreen_git.bb b/recipes-demo-hmi/homescreen/homescreen_git.bb
index a49c30508..715862c7f 100644
--- a/recipes-demo-hmi/homescreen/homescreen_git.bb
+++ b/recipes-demo-hmi/homescreen/homescreen_git.bb
@@ -10,10 +10,8 @@ DEPENDS = "\
qtdeclarative \
qtquickcontrols2 \
agl-service-homescreen \
- agl-service-windowmanager \
agl-service-weather \
libqtappfw \
- qlibwindowmanager \
libhomescreen \
libafb-helpers-qt \
"
diff --git a/recipes-demo-hmi/hvac/hvac_git.bb b/recipes-demo-hmi/hvac/hvac_git.bb
index 6091e51e2..5e36e2d41 100644
--- a/recipes-demo-hmi/hvac/hvac_git.bb
+++ b/recipes-demo-hmi/hvac/hvac_git.bb
@@ -14,8 +14,9 @@ S = "${WORKDIR}/git"
# build-time dependencies
DEPENDS += "qtquickcontrols2 libhomescreen \
- qlibwindowmanager qttools-native \
- qtaglextras libqtappfw"
+ qttools-native \
+ libqtappfw"
+
RDEPENDS_${PN} = "agl-service-hvac libqtappfw"
inherit qmake5 aglwgt
diff --git a/recipes-demo-hmi/launcher/launcher_git.bb b/recipes-demo-hmi/launcher/launcher_git.bb
index 8c3f72f68..d9ecb54f6 100644
--- a/recipes-demo-hmi/launcher/launcher_git.bb
+++ b/recipes-demo-hmi/launcher/launcher_git.bb
@@ -10,7 +10,6 @@ DEPENDS = "\
qtdeclarative \
qtquickcontrols2 \
qtwebsockets \
- qlibwindowmanager \
qlibhomescreen \
"
diff --git a/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb b/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb
index 2e8468106..974b20275 100644
--- a/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb
+++ b/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb
@@ -17,7 +17,6 @@ DEPENDS += "qtquickcontrols2 \
qtwebsockets \
libqtappfw \
libhomescreen \
- qlibwindowmanager \
"
inherit qmake5 aglwgt
diff --git a/recipes-demo-hmi/messaging/messaging_git.bb b/recipes-demo-hmi/messaging/messaging_git.bb
index f6b545d62..d2e3ff80d 100644
--- a/recipes-demo-hmi/messaging/messaging_git.bb
+++ b/recipes-demo-hmi/messaging/messaging_git.bb
@@ -16,7 +16,6 @@ S = "${WORKDIR}/git"
DEPENDS += "qtquickcontrols2 \
libqtappfw \
libhomescreen \
- qlibwindowmanager \
"
inherit qmake5 aglwgt
diff --git a/recipes-demo-hmi/mixer/mixer_git.bb b/recipes-demo-hmi/mixer/mixer_git.bb
index 9524bed66..1e4a2717c 100644
--- a/recipes-demo-hmi/mixer/mixer_git.bb
+++ b/recipes-demo-hmi/mixer/mixer_git.bb
@@ -15,7 +15,6 @@ S = "${WORKDIR}/git"
# build-time dependencies
DEPENDS += "qtquickcontrols2 \
qtwebsockets \
- qtaglextras \
libafb-helpers-qt \
"
diff --git a/recipes-demo-hmi/navigation/navigation-demo_git.bb b/recipes-demo-hmi/navigation/navigation-demo_git.bb
index b1d0407f3..7f3fcdf10 100644
--- a/recipes-demo-hmi/navigation/navigation-demo_git.bb
+++ b/recipes-demo-hmi/navigation/navigation-demo_git.bb
@@ -17,7 +17,6 @@ RPROVIDES_${PN} = "virtual/navigation"
DEPENDS += "qtquickcontrols2 \
libhomescreen \
- qlibwindowmanager \
qtvirtualkeyboard \
qtlocation \
"
diff --git a/recipes-demo-hmi/navigation/ondemandnavi_git.bb b/recipes-demo-hmi/navigation/ondemandnavi_git.bb
index c52655ef0..c06dcae22 100644
--- a/recipes-demo-hmi/navigation/ondemandnavi_git.bb
+++ b/recipes-demo-hmi/navigation/ondemandnavi_git.bb
@@ -8,9 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
DEPENDS += "qtquickcontrols2 \
qlibhomescreen \
- qlibwindowmanager \
qtlocation \
- qtaglextras \
libqtappfw \
"
diff --git a/recipes-demo-hmi/navigation/poiapp_git.bb b/recipes-demo-hmi/navigation/poiapp_git.bb
index b8db9ac93..bd3fc64d2 100644
--- a/recipes-demo-hmi/navigation/poiapp_git.bb
+++ b/recipes-demo-hmi/navigation/poiapp_git.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=947b2d60ca3872e172034438e9801200"
DEPENDS += "qtbase json-c \
- qlibwindowmanager libhomescreen \
+ libhomescreen \
libqtappfw \
"
diff --git a/recipes-demo-hmi/navigation/tbtnavi_git.bb b/recipes-demo-hmi/navigation/tbtnavi_git.bb
index a61f2c924..e27fe7359 100644
--- a/recipes-demo-hmi/navigation/tbtnavi_git.bb
+++ b/recipes-demo-hmi/navigation/tbtnavi_git.bb
@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \
DEPENDS += "qtbase \
qtquickcontrols2 \
qlibhomescreen \
- qlibwindowmanager \
qtlocation \
libqtappfw \
"
diff --git a/recipes-demo-hmi/onscreenapp/onscreenapp_git.bb b/recipes-demo-hmi/onscreenapp/onscreenapp_git.bb
index ae905ea60..b0f63d162 100644
--- a/recipes-demo-hmi/onscreenapp/onscreenapp_git.bb
+++ b/recipes-demo-hmi/onscreenapp/onscreenapp_git.bb
@@ -13,6 +13,6 @@ PV = "1.0+git${SRCPV}"
S = "${WORKDIR}/git"
# build-time dependencies
-DEPENDS += "qtquickcontrols2 libhomescreen qlibhomescreen libwindowmanager qlibwindowmanager"
+DEPENDS += "qtquickcontrols2 libhomescreen qlibhomescreen"
inherit qmake5 aglwgt
diff --git a/recipes-demo-hmi/phone/phone_git.bb b/recipes-demo-hmi/phone/phone_git.bb
index cab30ea6b..a8781852d 100644
--- a/recipes-demo-hmi/phone/phone_git.bb
+++ b/recipes-demo-hmi/phone/phone_git.bb
@@ -16,7 +16,6 @@ S = "${WORKDIR}/git"
DEPENDS += "qtquickcontrols2 \
libqtappfw \
libhomescreen \
- qlibwindowmanager \
gstreamer1.0 \
"
diff --git a/recipes-demo-hmi/radio/radio_git.bb b/recipes-demo-hmi/radio/radio_git.bb
index 3a89af588..7b0934faa 100644
--- a/recipes-demo-hmi/radio/radio_git.bb
+++ b/recipes-demo-hmi/radio/radio_git.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
# build-time dependencies
DEPENDS = "qtquickcontrols2 rtl-sdr"
-DEPENDS += "libhomescreen qlibwindowmanager libqtappfw"
+DEPENDS += "libhomescreen libqtappfw"
inherit qmake5 aglwgt
diff --git a/recipes-demo-hmi/settings/settings_git.bb b/recipes-demo-hmi/settings/settings_git.bb
index 17b83dc9f..776c764ca 100644
--- a/recipes-demo-hmi/settings/settings_git.bb
+++ b/recipes-demo-hmi/settings/settings_git.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/git"
# build-time dependencies
DEPENDS += "libqtappfw qtquickcontrols2 qt-qrcode"
-DEPENDS += "libhomescreen qlibwindowmanager qtvirtualkeyboard"
+DEPENDS += "libhomescreen qtvirtualkeyboard"
# runtime dependencies
RDEPENDS_${PN} += " \
diff --git a/recipes-demo-hmi/taskmanager/taskmanager_git.bb b/recipes-demo-hmi/taskmanager/taskmanager_git.bb
index 13f16fca5..68965eb55 100644
--- a/recipes-demo-hmi/taskmanager/taskmanager_git.bb
+++ b/recipes-demo-hmi/taskmanager/taskmanager_git.bb
@@ -18,7 +18,6 @@ DEPENDS += "qtquickcontrols2 \
qtcharts \
libqtappfw \
libhomescreen \
- qlibwindowmanager \
"
inherit qmake5 aglwgt