Migrate demo app recipes and patch apps to Qt 6

Bug-AGL: SPEC-5294

Change-Id: I6b9ff940745f88af9a3b69e29917082e52b25f88
Signed-off-by: Indivara Weerasuriya <indivara.weerasuriya@qt.io>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30141
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

2 files changed, 77 insertions, 4 deletions

diff --git a/recipes-demo/dashboard/dashboard/0001-Migrate-to-Qt-6.patch b/recipes-demo/dashboard/dashboard/0001-Migrate-to-Qt-6.patch
new file mode 100644
index 000000000..b43008fdd
--- /dev/null
+++ b/recipes-demo/dashboard/dashboard/0001-Migrate-to-Qt-6.patch
@@ -0,0 +1,72 @@
+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 c0ca244cc..c4385400b 100644
--- a/recipes-demo/dashboard/dashboard_git.bb
+++ b/recipes-demo/dashboard/dashboard_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
 DEPENDS = " \
     qttools-native \
-    qtquickcontrols2 \
+    qtdeclarative \
     libqtappfw \
 "
 
@@ -17,12 +17,13 @@ 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"
 
 S = "${WORKDIR}/git"
 
-inherit qmake5 pkgconfig agl-app
+inherit qt6-qmake pkgconfig agl-app
 
 AGL_APP_NAME = "Dashboard"
 
@@ -42,6 +43,6 @@ do_install:append() {
 RDEPENDS:${PN} += " \
     qtwayland \
     qtbase-qmlplugins \
-    qtgraphicaleffects-qmlplugins \
+    qt5compat \
     qtquickcontrols2-agl-style \
 "