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/radio | |
| 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/radio')
| -rw-r--r-- | recipes-demo/radio/files/0001-Migrate-to-Qt-6.patch | 103 | ||||
| -rw-r--r-- | recipes-demo/radio/radio_git.bb | 3 |
2 files changed, 1 insertions, 105 deletions
diff --git a/recipes-demo/radio/files/0001-Migrate-to-Qt-6.patch b/recipes-demo/radio/files/0001-Migrate-to-Qt-6.patch deleted file mode 100644 index 245324c4b..000000000 --- a/recipes-demo/radio/files/0001-Migrate-to-Qt-6.patch +++ /dev/null @@ -1,103 +0,0 @@ -From a1a5be00d1e5ba0d857b9b83769a2c666c2be313 Mon Sep 17 00:00:00 2001 -From: Indivara Weerasuriya <1806262-indivara@users.noreply.git.qt.io> -Date: Wed, 24 Jul 2024 09:46:03 +0900 -Subject: [PATCH] Migrate to Qt 6 - ---- - app/Radio.qml | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/app/Radio.qml b/app/Radio.qml -index bd67c84..d2950af 100644 ---- a/app/Radio.qml -+++ b/app/Radio.qml -@@ -60,7 +60,7 @@ ApplicationWindow { - anchors.right: parent.right - anchors.bottom: controls.top - fillMode: Image.Stretch -- source: './images/HMI_Radio_Equalizer.svg' -+ source: 'qrc:/images/HMI_Radio_Equalizer.svg' - } - Item { - id: controls -@@ -83,11 +83,11 @@ ApplicationWindow { - Row { - spacing: 20 - Image { -- source: './images/FM_Icons_FM.svg' -+ source: 'qrc:/images/FM_Icons_FM.svg' - } - // ToggleButton { --// offImage: './images/FM_Icons_FM.svg' --// onImage: './images/FM_Icons_AM.svg' -+// offImage: 'qrc:/images/FM_Icons_FM.svg' -+// onImage: 'qrc:/images/FM_Icons_AM.svg' - // onCheckedChanged: { - // radio.band = checked ? radio.amBand : radio.fmBand - // radio.frequency = radio.minFrequency -@@ -146,7 +146,7 @@ ApplicationWindow { - } - - ImageButton { -- offImage: './images/AGL_MediaPlayer_BackArrow.svg' -+ offImage: 'qrc:/images/AGL_MediaPlayer_BackArrow.svg' - Timer { - running: parent.pressed - triggeredOnStart: true -@@ -162,7 +162,7 @@ ApplicationWindow { - } - - ImageButton { -- offImage: './images/AGL_MediaPlayer_ForwardArrow.svg' -+ offImage: 'qrc:/images/AGL_MediaPlayer_ForwardArrow.svg' - Timer { - running: parent.pressed - triggeredOnStart: true -@@ -181,7 +181,7 @@ ApplicationWindow { - - ImageButton { - id: play -- offImage: './images/AGL_MediaPlayer_Player_Play.svg' -+ offImage: 'qrc:/images/AGL_MediaPlayer_Player_Play.svg' - onClicked: { - radio.start() - } -@@ -190,7 +190,7 @@ ApplicationWindow { - when: radio.playing - PropertyChanges { - target: play -- offImage: './images/AGL_MediaPlayer_Player_Pause.svg' -+ offImage: 'qrc:/images/AGL_MediaPlayer_Player_Pause.svg' - onClicked: radio.stop() - } - } -@@ -207,7 +207,7 @@ ApplicationWindow { - - ImageButton { - id: scanBackwardBtn -- offImage: './images/AGL_MediaPlayer_BackArrow.svg' -+ offImage: 'qrc:/images/AGL_MediaPlayer_BackArrow.svg' - states: [ - State { - when: radio.playing -@@ -224,7 +224,7 @@ ApplicationWindow { - - ImageButton { - id: scanForwardBtn -- offImage: './images/AGL_MediaPlayer_ForwardArrow.svg' -+ offImage: 'qrc:/images/AGL_MediaPlayer_ForwardArrow.svg' - states: [ - State { - when: radio.playing -@@ -284,9 +284,9 @@ ApplicationWindow { - source: { - switch (model.modelData.band) { - case radio.fmBand: -- return './images/FM_Icons_FM.svg' -+ return 'qrc:/images/FM_Icons_FM.svg' - case radio.amBand: -- return './images/FM_Icons_AM.svg' -+ return 'qrc:/images/FM_Icons_AM.svg' - } - return null - } diff --git a/recipes-demo/radio/radio_git.bb b/recipes-demo/radio/radio_git.bb index 06112a046..c00cd68d5 100644 --- a/recipes-demo/radio/radio_git.bb +++ b/recipes-demo/radio/radio_git.bb @@ -14,9 +14,8 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/radio;protocol=https;bra file://presets-ALS.conf \ file://presets-CES.conf \ file://presets-FOSDEM.conf \ - file://0001-Migrate-to-Qt-6.patch \ " -SRCREV = "aef392d9df8bb5e4ada4b3f8f44016e8a839d154" +SRCREV = "6a1ff73f3d561aa945f64460433498583d81dabb" S = "${WORKDIR}/git" |