diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2024-11-24 16:13:34 -0500 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2024-11-24 21:16:08 +0000 |
| commit | 7b54a3782d9981f849a88c023742a7d7f8be7232 (patch) | |
| tree | ccecde04e8b3afdfeac1646b808af2b34535c46c /app/qml | |
| parent | c0d6ed828bfeda244b231dccbbeaa24ae860f095 (diff) | |
Switch to Qt6
Initial conversion to using Qt6, based on changes done to other
apps.
Bug-AGL: SPEC-5294
Change-Id: If62ffd1bf440f856ce73410bd3f47f4a8b97b2a4
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'app/qml')
| -rw-r--r-- | app/qml/InfoWindow.qml | 6 | ||||
| -rw-r--r-- | app/qml/Main.qml | 6 | ||||
| -rw-r--r-- | app/qml/MapWindow.qml | 7 | ||||
| -rw-r--r-- | app/qml/TbtBoard.qml | 2 |
4 files changed, 10 insertions, 11 deletions
diff --git a/app/qml/InfoWindow.qml b/app/qml/InfoWindow.qml index 7183040..b8f5044 100644 --- a/app/qml/InfoWindow.qml +++ b/app/qml/InfoWindow.qml @@ -1,6 +1,6 @@ -import QtQuick 2.9 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls Rectangle { id: infoWindow diff --git a/app/qml/Main.qml b/app/qml/Main.qml index 80191b0..94d907f 100644 --- a/app/qml/Main.qml +++ b/app/qml/Main.qml @@ -1,7 +1,7 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.2 +import QtQuick +import QtQuick.Controls -import QtQuick.Window 2.11 +import QtQuick.Window ApplicationWindow { id: tbtnavi diff --git a/app/qml/MapWindow.qml b/app/qml/MapWindow.qml index 13eb895..bf659b9 100644 --- a/app/qml/MapWindow.qml +++ b/app/qml/MapWindow.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 -import QtLocation 5.9 -import QtPositioning 5.9 +import QtQuick +import QtLocation +import QtPositioning import com.mapbox.cheap_ruler 1.0 @@ -66,7 +66,6 @@ Item { center: ruler.currentPosition zoomLevel: maximumZoomLevel < 20 ? maximumZoomLevel : 20 tilt: 60 - gesture.acceptedGestures:MapGestureArea.NoGesture copyrightsVisible: false RotationAnimation on bearing { diff --git a/app/qml/TbtBoard.qml b/app/qml/TbtBoard.qml index ccec5fd..a951558 100644 --- a/app/qml/TbtBoard.qml +++ b/app/qml/TbtBoard.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick //turn by turn board view Item { |