diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2024-11-22 17:58:54 -0500 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-25 11:25:41 +0000 |
| commit | 24e55fccab51e217d4452968b082f0531a05fcb5 (patch) | |
| tree | e3e0dd1e9dfed15c9f94ec0af20f2b6590b86845 /recipes-demo/mediaplayer | |
| parent | 275de1d5dceae84c872e354f2f8b15ad275f97ae (diff) | |
Update Qt demo app SRCREVs
Update Qt demo app SRCREVs to pick up their Qt6 updates, and drop the
now unnecssary Qt6 patches. Also, the MapBox configuration support
has been removed from the ondemandnavi-config recipe, as that backend
is no longer supported by QtLocation in Qt6.
Bug-AGL: SPEC-5294
Change-Id: Ib44c6be83c3d4654c9ed5adffa3e9d34057eb2ae
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30543
ci-image-boot-test: Jenkins Job builder account
Tested-by: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
ci-image-build: Jenkins Job builder account
Diffstat (limited to 'recipes-demo/mediaplayer')
| -rw-r--r-- | recipes-demo/mediaplayer/mediaplayer/0001-Migrate-to-Qt-6.patch | 87 | ||||
| -rw-r--r-- | recipes-demo/mediaplayer/mediaplayer_git.bb | 3 |
2 files changed, 1 insertions, 89 deletions
diff --git a/recipes-demo/mediaplayer/mediaplayer/0001-Migrate-to-Qt-6.patch b/recipes-demo/mediaplayer/mediaplayer/0001-Migrate-to-Qt-6.patch deleted file mode 100644 index fc7dcb234..000000000 --- a/recipes-demo/mediaplayer/mediaplayer/0001-Migrate-to-Qt-6.patch +++ /dev/null @@ -1,87 +0,0 @@ -From b98a116f91e967eca96ecd3052eeeb78d8002e0c Mon Sep 17 00:00:00 2001 -From: Indivara Weerasuriya <1806262-indivara@users.noreply.git.qt.io> -Date: Wed, 24 Jul 2024 09:24:39 +0900 -Subject: [PATCH] Migrate to Qt 6 - ---- - app/MediaPlayer.qml | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/app/MediaPlayer.qml b/app/MediaPlayer.qml -index fd4db58..6f381da 100644 ---- a/app/MediaPlayer.qml -+++ b/app/MediaPlayer.qml -@@ -174,14 +174,14 @@ ApplicationWindow { - //ToggleButton { - // id: random - // visible: bluetooth.connected == false -- // offImage: './images/AGL_MediaPlayer_Shuffle_Inactive.svg' -- // onImage: './images/AGL_MediaPlayer_Shuffle_Active.svg' -+ // offImage: 'qrc:/images/AGL_MediaPlayer_Shuffle_Inactive.svg' -+ // onImage: 'qrc:/images/AGL_MediaPlayer_Shuffle_Active.svg' - //} - ToggleButton { - id: loop - visible: player.av_connected === false -- offImage: './images/AGL_MediaPlayer_Loop_Inactive.svg' -- onImage: './images/AGL_MediaPlayer_Loop_Active.svg' -+ offImage: 'qrc:/images/AGL_MediaPlayer_Loop_Inactive.svg' -+ onImage: 'qrc:/images/AGL_MediaPlayer_Loop_Active.svg' - onClicked: { mediaplayer.loop(checked ? "playlist" : "off") } - } - } -@@ -228,15 +228,15 @@ ApplicationWindow { - RowLayout { - Layout.fillHeight: true - // Image { --// source: './images/AGL_MediaPlayer_Playlist_Inactive.svg' -+// source: 'qrc:/images/AGL_MediaPlayer_Playlist_Inactive.svg' - // } - // Image { --// source: './images/AGL_MediaPlayer_CD_Inactive.svg' -+// source: 'qrc:/images/AGL_MediaPlayer_CD_Inactive.svg' - // } - Item { Layout.fillWidth: true } - ImageButton { - id: previous -- offImage: './images/AGL_MediaPlayer_BackArrow.svg' -+ offImage: 'qrc:/images/AGL_MediaPlayer_BackArrow.svg' - onClicked: { - mediaplayer.previous() - } -@@ -248,7 +248,7 @@ ApplicationWindow { - when: player.status == "playing" - PropertyChanges { - target: play -- offImage: './images/AGL_MediaPlayer_Player_Pause.svg' -+ offImage: 'qrc:/images/AGL_MediaPlayer_Player_Pause.svg' - onClicked: { - mediaplayer.pause() - } -@@ -258,7 +258,7 @@ ApplicationWindow { - when: player.status != "playing" - PropertyChanges { - target: play -- offImage: './images/AGL_MediaPlayer_Player_Play.svg' -+ offImage: 'qrc:/images/AGL_MediaPlayer_Player_Play.svg' - onClicked: mediaplayer.play() - } - } -@@ -266,7 +266,7 @@ ApplicationWindow { - } - ImageButton { - id: forward -- offImage: './images/AGL_MediaPlayer_ForwardArrow.svg' -+ offImage: 'qrc:/images/AGL_MediaPlayer_ForwardArrow.svg' - onClicked: { - mediaplayer.next() - } -@@ -284,7 +284,7 @@ ApplicationWindow { - mediaplayer.disconnect() - } - contentItem: Image { -- source: player.av_connected ? './images/AGL_MediaPlayer_Bluetooth_Active.svg' : './images/AGL_MediaPlayer_Bluetooth_Inactive.svg' -+ source: player.av_connected ? 'qrc:/images/AGL_MediaPlayer_Bluetooth_Active.svg' : 'qrc:/images/AGL_MediaPlayer_Bluetooth_Inactive.svg' - } - } - } diff --git a/recipes-demo/mediaplayer/mediaplayer_git.bb b/recipes-demo/mediaplayer/mediaplayer_git.bb index 1f3b070ce..90364401c 100644 --- a/recipes-demo/mediaplayer/mediaplayer_git.bb +++ b/recipes-demo/mediaplayer/mediaplayer_git.bb @@ -13,9 +13,8 @@ PV = "2.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mediaplayer;protocol=https;branch=${AGL_BRANCH} \ file://mediaplayer.conf \ file://mediaplayer.token \ - file://0001-Migrate-to-Qt-6.patch \ " -SRCREV = "0aefba20fe07dbb79d7b3683ab38c0b0b313a655" +SRCREV = "4f733db769ac96df3e83b9c90506924ee6f19800" S = "${WORKDIR}/git" |