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>

3 files changed, 236 insertions, 8 deletions

diff --git a/recipes-demo/navigation/ondemandnavi/0001-Migrate-to-Qt-6.patch b/recipes-demo/navigation/ondemandnavi/0001-Migrate-to-Qt-6.patch
new file mode 100644
index 000000000..45a690c24
--- /dev/null
+++ b/recipes-demo/navigation/ondemandnavi/0001-Migrate-to-Qt-6.patch
@@ -0,0 +1,229 @@
+From f12a16fd4b959eb47c9ba88af1d80c31a7cd7f20 Mon Sep 17 00:00:00 2001
+From: Indivara Weerasuriya <1806262-indivara@users.noreply.git.qt.io>
+Date: Wed, 24 Jul 2024 09:32:44 +0900
+Subject: [PATCH] Migrate to Qt 6
+
+---
+ app/BtnArrow.qml                |  4 +--
+ app/BtnEnlarge.qml              |  4 +--
+ app/BtnGuidance.qml             |  8 ++---
+ app/BtnMapDirection.qml         |  4 +--
+ app/BtnPresentPosition.qml      |  4 +--
+ app/BtnShrink.qml               |  4 +--
+ app/ImgDestinationDirection.qml |  2 +-
+ app/ProgressNextCross.qml       | 59 ++++++++++++++++++++++++++++-----
+ app/app.pro                     |  2 +-
+ app/navigation.qml              | 19 ++++-------
+ 10 files changed, 72 insertions(+), 38 deletions(-)
+
+diff --git a/app/BtnArrow.qml b/app/BtnArrow.qml
+index 2039865..5a999c9 100644
+--- a/app/BtnArrow.qml
++++ b/app/BtnArrow.qml
+@@ -1,5 +1,5 @@
+-import QtQuick 2.0
+-import QtQuick.Controls 1.5
++import QtQuick
++import QtQuick.Controls
+ 
+ Item {
+ 	Button {
+diff --git a/app/BtnEnlarge.qml b/app/BtnEnlarge.qml
+index cc158ad..eafee56 100644
+--- a/app/BtnEnlarge.qml
++++ b/app/BtnEnlarge.qml
+@@ -1,5 +1,5 @@
+-import QtQuick 2.0
+-import QtQuick.Controls 1.5
++import QtQuick
++import QtQuick.Controls
+ 
+ Item {
+ 	Button {
+diff --git a/app/BtnGuidance.qml b/app/BtnGuidance.qml
+index 2130857..b6267df 100644
+--- a/app/BtnGuidance.qml
++++ b/app/BtnGuidance.qml
+@@ -1,7 +1,7 @@
+-import QtQuick 2.0
+-import QtQuick.Controls 1.5
+-import QtLocation 5.9
+-import QtPositioning 5.6
++import QtQuick
++import QtQuick.Controls
++import QtLocation
++import QtPositioning
+ 
+ Item {
+     id: btn_guidance
+diff --git a/app/BtnMapDirection.qml b/app/BtnMapDirection.qml
+index c56f0bf..cd703ff 100644
+--- a/app/BtnMapDirection.qml
++++ b/app/BtnMapDirection.qml
+@@ -1,5 +1,5 @@
+-import QtQuick 2.0
+-import QtQuick.Controls 1.5
++import QtQuick
++import QtQuick.Controls
+ 
+ Item {
+     Button {
+diff --git a/app/BtnPresentPosition.qml b/app/BtnPresentPosition.qml
+index 2734664..01761c8 100644
+--- a/app/BtnPresentPosition.qml
++++ b/app/BtnPresentPosition.qml
+@@ -1,5 +1,5 @@
+-import QtQuick 2.0
+-import QtQuick.Controls 1.5
++import QtQuick
++import QtQuick.Controls
+ 
+ Item {
+     id: btn_present_position
+diff --git a/app/BtnShrink.qml b/app/BtnShrink.qml
+index 23859dc..079d6d6 100644
+--- a/app/BtnShrink.qml
++++ b/app/BtnShrink.qml
+@@ -1,5 +1,5 @@
+-import QtQuick 2.0
+-import QtQuick.Controls 1.5
++import QtQuick
++import QtQuick.Controls
+ 
+ Item {
+ 	Button {
+diff --git a/app/ImgDestinationDirection.qml b/app/ImgDestinationDirection.qml
+index e6ee5de..b80aca8 100644
+--- a/app/ImgDestinationDirection.qml
++++ b/app/ImgDestinationDirection.qml
+@@ -1,4 +1,4 @@
+-import QtQuick 2.0
++import QtQuick
+ 
+ Item {
+ 	id: img_destination_direction
+diff --git a/app/ProgressNextCross.qml b/app/ProgressNextCross.qml
+index 31e552c..a597c97 100644
+--- a/app/ProgressNextCross.qml
++++ b/app/ProgressNextCross.qml
+@@ -1,6 +1,5 @@
+-import QtQuick 2.0
+-import QtQuick.Controls 1.5
+-import QtQuick.Controls.Styles 1.4
++import QtQuick
++import QtQuick.Controls
+ 
+ Item {
+ 	id: progress_next_cross
+@@ -24,14 +23,56 @@ Item {
+ 		id: bar
+ 		width: 25
+ 		height: 100
+-        orientation: Qt.Vertical
++        rotation: 90
+         value: 0
+-        minimumValue: 0
+-        maximumValue: 300
++        from: 0
++        to: 300
+ 
+-        style: ProgressBarStyle {
+-            progress: Rectangle {
+-                color: "green"
++        background: Rectangle {
++            implicitWidth: 200
++            implicitHeight: 6
++            color: "#e6e6e6"
++            radius: 3
++        }
++
++        contentItem: Item {
++            implicitWidth: 200
++            implicitHeight: 4
++
++            // Progress indicator for determinate state.
++            Rectangle {
++                width: bar.visualPosition * parent.width
++                height: parent.height
++                radius: 2
++                color: "#17a81a"
++                visible: !bar.indeterminate
++            }
++
++            // Scrolling animation for indeterminate state.
++            Item {
++                anchors.fill: parent
++                visible: bar.indeterminate
++                clip: true
++
++                Row {
++                    spacing: 20
++
++                    Repeater {
++                        model: bar.width / 40 + 1
++
++                        Rectangle {
++                            color: "#17a81a"
++                            width: 20
++                            height: bar.height
++                        }
++                    }
++                    XAnimator on x {
++                        from: 0
++                        to: -40
++                        loops: Animation.Infinite
++                        running: bar.indeterminate
++                    }
++                }
+             }
+         }
+ 	}
+diff --git a/app/app.pro b/app/app.pro
+index 1a0a9c3..849810d 100644
+--- a/app/app.pro
++++ b/app/app.pro
+@@ -1,6 +1,6 @@
+ TEMPLATE = app
+ TARGET = navigation
+-QT = core qml quick positioning
++QT = core qml quick positioning location
+ CONFIG += c++11 link_pkgconfig
+ 
+ PKGCONFIG += qtappfw-navigation qtappfw-vehicle-signals
+diff --git a/app/navigation.qml b/app/navigation.qml
+index 5cb3634..0d61d46 100644
+--- a/app/navigation.qml
++++ b/app/navigation.qml
+@@ -15,12 +15,12 @@
+  * limitations under the License.
+  */
+ 
+-import QtQuick 2.6
+-import QtQuick.Layouts 1.1
+-import QtQuick.Controls 2.0
+-import QtLocation 5.9
+-import QtPositioning 5.6
+-import QtQuick.Window 2.11
++import QtQuick
++import QtQuick.Layouts
++import QtQuick.Controls
++import QtLocation
++import QtPositioning
++import QtQuick.Window
+ 
+ ApplicationWindow {
+     id: root
+@@ -476,13 +476,6 @@ ApplicationWindow {
+             }
+         }
+ 
+-        gesture.onFlickStarted: {
+-            btn_present_position.state = "Optional"
+-        }
+-        gesture.onPanStarted: {
+-            btn_present_position.state = "Optional"
+-        }
+-
+         function updatePositon() {
+             if (!routeModel.get(0))
+                 return;
diff --git a/recipes-demo/navigation/ondemandnavi_git.bb b/recipes-demo/navigation/ondemandnavi_git.bb
index cf53b2bad..7785bcd1d 100644
--- a/recipes-demo/navigation/ondemandnavi_git.bb
+++ b/recipes-demo/navigation/ondemandnavi_git.bb
@@ -6,7 +6,7 @@ SECTION     = "apps"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
-DEPENDS = "qtquickcontrols2 qtlocation libqtappfw"
+DEPENDS = "qtdeclarative qtlocation libqtappfw"
 
 PV = "2.0+git${SRCPV}"
 
@@ -15,12 +15,13 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/ondemandnavi;protocol=ht
            file://navigation.conf.kvm-demo \
            file://navigation.conf.gateway-demo \
            file://navigation.token \
-"
+           file://0001-Migrate-to-Qt-6.patch \
+           "
 SRCREV = "d6b883ef6bdb63fb501b03d64c9a32bc29b7b2c7"
 
 S = "${WORKDIR}/git"
 
-inherit qmake5 pkgconfig agl-app update-alternatives
+inherit qt6-qmake pkgconfig agl-app update-alternatives
 
 AGL_APP_ID = "navigation"
 AGL_APP_NAME = "Navigation"
@@ -67,9 +68,7 @@ ALTERNATIVE_PRIORITY_${PN}-conf-kvm-demo = "30"
 RDEPENDS:${PN} += " \
     qtwayland \
     qtbase-qmlplugins \
-    qtgraphicaleffects-qmlplugins \
-    qtquickcontrols-qmlplugins \
-    qtquickcontrols2-qmlplugins \
+    qt5compat \
     qtquickcontrols2-agl \
     qtquickcontrols2-agl-style \
     qtlocation \
diff --git a/recipes-demo/navigation/tbtnavi_git.bb b/recipes-demo/navigation/tbtnavi_git.bb
index 3c6571b15..ec0c6f23a 100644
--- a/recipes-demo/navigation/tbtnavi_git.bb
+++ b/recipes-demo/navigation/tbtnavi_git.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \
 
 DEPENDS = " \
     qtbase \
-    qtquickcontrols2 \
+    qtdeclarative \
     qtlocation \
     libqtappfw \
     qtwayland-native \
@@ -64,7 +64,7 @@ ALTERNATIVE_LINK_NAME[tbtnavi.conf] = "${sysconfdir}/xdg/AGL/tbtnavi.conf"
 RDEPENDS:${PN} += " \
     qtwayland \
     qtbase-qmlplugins \
-    qtgraphicaleffects-qmlplugins \
+    qt5compat \
     qtlocation \
     ondemandnavi-config \
     libqtappfw \