summaryrefslogtreecommitdiffstats
path: root/recipes-demo/navigation/ondemandnavi
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2024-11-22 17:58:54 -0500
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-11-25 11:25:41 +0000
commit24e55fccab51e217d4452968b082f0531a05fcb5 (patch)
treee3e0dd1e9dfed15c9f94ec0af20f2b6590b86845 /recipes-demo/navigation/ondemandnavi
parent275de1d5dceae84c872e354f2f8b15ad275f97ae (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/navigation/ondemandnavi')
-rw-r--r--recipes-demo/navigation/ondemandnavi/0001-Migrate-to-Qt-6.patch229
1 files changed, 0 insertions, 229 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
deleted file mode 100644
index 45a690c24..000000000
--- a/recipes-demo/navigation/ondemandnavi/0001-Migrate-to-Qt-6.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-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;