diff options
| -rw-r--r-- | basicsuite/ebike-ui/NaviPage.qml | 16 | ||||
| -rw-r--r-- | doc/b2qt-demos.qdoc | 2 | ||||
| -rw-r--r-- | doc/b2qt-demos.qdocconf | 10 |
3 files changed, 18 insertions, 10 deletions
diff --git a/basicsuite/ebike-ui/NaviPage.qml b/basicsuite/ebike-ui/NaviPage.qml index e059e68..0b6c3e3 100644 --- a/basicsuite/ebike-ui/NaviPage.qml +++ b/basicsuite/ebike-ui/NaviPage.qml @@ -431,7 +431,7 @@ Page { RouteModel { id: routeModel - plugin: map.plugin + plugin: mapbox query: routeQuery onStatusChanged: { if (status === RouteModel.Ready) { @@ -626,14 +626,22 @@ Page { Plugin { id: mapboxgl - name: "mapbox" + name: "mapboxgl" PluginParameter { name: "mapbox.access_token" value: "pk.eyJ1IjoibWFwYm94NHF0IiwiYSI6ImNpd3J3eDE0eDEzdm8ydHM3YzhzajlrN2oifQ.keEkjqm79SiFDFjnesTcgQ" } PluginParameter { - name: "mapbox.mapping.map_id" - value: "mapbox.run-bike-hike" + name: "mapboxgl.mapping.additional_style_urls" + value: "mapbox://styles/mapbox/outdoors-v11" + } + } + Plugin { + id: mapbox + name: "mapbox" + PluginParameter { + name: "mapbox.access_token" + value: "pk.eyJ1IjoibWFwYm94NHF0IiwiYSI6ImNpd3J3eDE0eDEzdm8ydHM3YzhzajlrN2oifQ.keEkjqm79SiFDFjnesTcgQ" } } diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc index 6701f10..a9b1b6e 100644 --- a/doc/b2qt-demos.qdoc +++ b/doc/b2qt-demos.qdoc @@ -50,7 +50,7 @@ /*! \page index.html - \title Qt 5.12.10 for Device Creation Examples and Demos + \title Qt 5.12.12 for Device Creation Examples and Demos \SDK has a number of examples and demos. These are included in the \B2Q images, available in the launcher that is run by default at diff --git a/doc/b2qt-demos.qdocconf b/doc/b2qt-demos.qdocconf index ec9a0d0..4bb809f 100644 --- a/doc/b2qt-demos.qdocconf +++ b/doc/b2qt-demos.qdocconf @@ -5,8 +5,8 @@ outputencoding = UTF-8 sourceencoding = UTF-8 project = QtforDeviceCreationDemos -description = Qt 5.12.10 for Device Creation Examples and Demos -version = 5.12.10 +description = Qt 5.12.12 for Device Creation Examples and Demos +version = 5.12.12 sourcedirs = . imagedirs += images @@ -21,9 +21,9 @@ exampledirs = .. qhp.projects = QtforDeviceCreationDemos qhp.QtforDeviceCreationDemos.file = b2qt-demos.qhp -qhp.QtforDeviceCreationDemos.namespace = org.qt-project.b2qt-demos.51210 +qhp.QtforDeviceCreationDemos.namespace = org.qt-project.b2qt-demos.51212 qhp.QtforDeviceCreationDemos.virtualFolder = b2qt-demos -qhp.QtforDeviceCreationDemos.indexTitle = Qt 5.12.10 for Device Creation Examples and Demos +qhp.QtforDeviceCreationDemos.indexTitle = Qt 5.12.12 for Device Creation Examples and Demos qhp.QtforDeviceCreationDemos.indexRoot = qhp.QtforDeviceCreationDemos.subprojects = demos @@ -35,4 +35,4 @@ manifestmeta.b2qt.names = "QtforDeviceCreationDemos/*" macro.B2Q = "Boot to Qt" macro.SDK = "Qt for Device Creation" -navigation.landingpage = "Qt 5.12.10 for Device Creation Examples and Demos" +navigation.landingpage = "Qt 5.12.12 for Device Creation Examples and Demos" |