diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-06-24 17:53:33 +0200 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-06-24 17:54:18 +0200 |
commit | 79473c2e7789d4887a449abad46732ed2b17f33d (patch) | |
tree | 96fb8ad57a15c96347da141d5bdaa9ee21f6ebb5 /recipes-demo-hmi/navigation | |
parent | cb5b0b199ec113591b17ca7b6bcb8dbd941b0876 (diff) | |
parent | c38d4a7ae95dd28cf2984787f703d4cc9f1b83b1 (diff) |
Merge the agl-compositor sandbox into master
The changes prepared by Marius for agl-compositor
have been reviewed in the sandbox/mvlad/agl-compositor.
This is the merge to master.
Notes:
- weston+ivi-shell+windowmanager are replaced using agl-compositor
- applications have been adapted accordingly
- CI will likely fail as we need to merge all related patches
* gerrit/sandbox/mvlad/agl-compositor:
Make the agl-compositor the default compositor
recipes-demo-hmi: Remove qtaglextras and *-windowmanager depends
packagegroup-agl-demo-platform: Remove qtaglextras dependency
packagegroup-hmi-framework: Remove *-windowmanager dependency
recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb | 6 ++++--
recipes-demo-hmi/dashboard/dashboard_git.bb | 2 +-
recipes-demo-hmi/homescreen/homescreen_git.bb | 6 ++++--
recipes-demo-hmi/hvac/hvac_git.bb | 5 +++--
recipes-demo-hmi/launcher/launcher_git.bb | 5 ++++-
recipes-demo-hmi/mediaplayer/mediaplayer_git.bb | 1 -
recipes-demo-hmi/messaging/messaging_git.bb | 1 -
recipes-demo-hmi/mixer/mixer_git.bb | 1 -
recipes-demo-hmi/navigation/navigation-demo_git.bb | 1 -
recipes-demo-hmi/navigation/ondemandnavi_git.bb | 2 --
recipes-demo-hmi/navigation/poiapp_git.bb | 2 +-
recipes-demo-hmi/navigation/tbtnavi_git.bb | 1 -
recipes-demo-hmi/onscreenapp/onscreenapp_git.bb | 2 +-
recipes-demo-hmi/phone/phone_git.bb | 1 -
recipes-demo-hmi/radio/radio_git.bb | 2 +-
recipes-demo-hmi/settings/settings_git.bb | 2 +-
recipes-demo-hmi/taskmanager/taskmanager_git.bb | 1 -
recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb | 4 +---
recipes-platform/packagegroups/packagegroup-hmi-framework.bb | 6 ------
19 files changed, 21 insertions(+), 30 deletions(-)
Change-Id: I2942a82beee36f283817ae566ec44b5f3219411f
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-demo-hmi/navigation')
-rw-r--r-- | recipes-demo-hmi/navigation/navigation-demo_git.bb | 1 | ||||
-rw-r--r-- | recipes-demo-hmi/navigation/ondemandnavi_git.bb | 2 | ||||
-rw-r--r-- | recipes-demo-hmi/navigation/poiapp_git.bb | 2 | ||||
-rw-r--r-- | recipes-demo-hmi/navigation/tbtnavi_git.bb | 1 |
4 files changed, 1 insertions, 5 deletions
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 \ " |