From 15d60e3b79431c4ed2331e3f0469f53a173e4564 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Wed, 16 Apr 2025 12:39:48 -0400
Subject: [PATCH] dashboard: update SRCREV

Update SRCREV to pick up:

3609f0e Add gitreview file for Super Salmon branch
205f7f3 Import Qt6 conversion patch

and drop the patch now that it is no longer required.

Bug-AGL: SPEC-5413

Change-Id: I028fa9a466b6cae4a9996c62d128196b2b9136af
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30923
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
---
 .../dashboard/dashboard/0001-Migrate-to-Qt-6.patch | 72 ----------------------
 recipes-demo/dashboard/dashboard_git.bb            |  3 +-
 2 files changed, 1 insertion(+), 74 deletions(-)
 delete mode 100644 recipes-demo/dashboard/dashboard/0001-Migrate-to-Qt-6.patch

diff --git a/recipes-demo/dashboard/dashboard/0001-Migrate-to-Qt-6.patch b/recipes-demo/dashboard/dashboard/0001-Migrate-to-Qt-6.patch
deleted file mode 100644
index b43008fdd..000000000
--- a/recipes-demo/dashboard/dashboard/0001-Migrate-to-Qt-6.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 00e6b77cef1f3b07dc49653d513628e452d71a8d Mon Sep 17 00:00:00 2001
-From: Indivara Weerasuriya <1806262-indivara@users.noreply.git.qt.io>
-Date: Wed, 24 Jul 2024 09:05:10 +0900
-Subject: [PATCH] Migrate to Qt 6
-
----
- app/Dashboard.qml    | 8 ++++----
- app/TirePressure.qml | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/app/Dashboard.qml b/app/Dashboard.qml
-index 1a797c6..5aabaf0 100644
---- a/app/Dashboard.qml
-+++ b/app/Dashboard.qml
-@@ -118,7 +118,7 @@ ApplicationWindow {
-     Image {
-         id: car
-         anchors.centerIn: parent
--        source: './images/HMI_Dashboard_Car.png'
-+        source: 'qrc:/images/HMI_Dashboard_Car.png'
-     }
- 
-     TirePressure {
-@@ -167,7 +167,7 @@ ApplicationWindow {
- 
-         Image {
-             id: speedIcon
--            source: './images/HMI_Dashboard_Speed_Icon.svg'
-+            source: 'qrc:/images/HMI_Dashboard_Speed_Icon.svg'
-         }
-         ProgressBar {
-             id: tachometer
-@@ -187,7 +187,7 @@ ApplicationWindow {
-         }
-         Image {
-             id: fuelIcon
--            source: './images/HMI_Dashboard_Fuel_Icon.svg'
-+            source: 'qrc:/images/HMI_Dashboard_Fuel_Icon.svg'
-         }
-         ProgressBar {
-             Layout.fillWidth: true
-@@ -196,7 +196,7 @@ ApplicationWindow {
-                 anchors.left: parent.left
-                 anchors.leftMargin: -40
-                 anchors.bottom: parent.top
--                source: './images/HMI_Dashboard_Fuel_Details.svg'
-+                source: 'qrc:/images/HMI_Dashboard_Fuel_Details.svg'
-                 GridLayout {
-                     anchors.fill: parent
-                     columns: 2
-diff --git a/app/TirePressure.qml b/app/TirePressure.qml
-index 437cf2f..eb02482 100644
---- a/app/TirePressure.qml
-+++ b/app/TirePressure.qml
-@@ -31,7 +31,7 @@ Image {
-             when: !mirror
-             PropertyChanges {
-                 target: root
--                source: './images/HMI_Dashboard_LeftTire.svg'
-+                source: 'qrc:/images/HMI_Dashboard_LeftTire.svg'
-             }
-             AnchorChanges {
-                 target: title
-@@ -47,7 +47,7 @@ Image {
-             when: mirror
-             PropertyChanges {
-                 target: root
--                source: './images/HMI_Dashboard_RightTire.svg'
-+                source: 'qrc:/images/HMI_Dashboard_RightTire.svg'
-             }
-             AnchorChanges {
-                 target: title
diff --git a/recipes-demo/dashboard/dashboard_git.bb b/recipes-demo/dashboard/dashboard_git.bb
index c4385400b..83a73d3d9 100644
--- a/recipes-demo/dashboard/dashboard_git.bb
+++ b/recipes-demo/dashboard/dashboard_git.bb
@@ -17,9 +17,8 @@ PV = "2.0+git${SRCPV}"
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/dashboard;protocol=https;branch=${AGL_BRANCH} \
            file://dashboard.conf \
            file://dashboard.token \
-           file://0001-Migrate-to-Qt-6.patch \
            "
-SRCREV  = "b1b67ab525555a082ca257ad08fc4fba9b1f74e3"
+SRCREV  = "3609f0e578d5056498830ffacaebb5b8aa3c1360"
 
 S = "${WORKDIR}/git"
 
-- 
2.16.6