diff options
| -rw-r--r-- | app/app.pro | 4 | ||||
| -rw-r--r-- | app/mapbox/MapPlugin.qml | 30 | ||||
| -rw-r--r-- | app/mapbox/mapbox.qrc | 5 | ||||
| -rw-r--r-- | app/navigation.qml | 13 |
4 files changed, 13 insertions, 39 deletions
diff --git a/app/app.pro b/app/app.pro index 9965675..8783f53 100644 --- a/app/app.pro +++ b/app/app.pro @@ -26,8 +26,7 @@ SOURCES += main.cpp \ RESOURCES += \ navigation.qrc \ - images/images.qrc \ - mapbox/mapbox.qrc + images/images.qrc LIBS += $$OUT_PWD/../dbus_interface/libdbus_interface.a INCLUDEPATH += $$OUT_PWD/../dbus_interface @@ -36,3 +35,4 @@ include(app.pri) DISTFILES += + diff --git a/app/mapbox/MapPlugin.qml b/app/mapbox/MapPlugin.qml deleted file mode 100644 index d0d3938..0000000 --- a/app/mapbox/MapPlugin.qml +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2016 The Qt Company Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * 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 - -Plugin { - name: "mapbox" - PluginParameter { - name: "mapbox.access_token"; - value: fileOperation.getMapAccessToken() - } -} - diff --git a/app/mapbox/mapbox.qrc b/app/mapbox/mapbox.qrc deleted file mode 100644 index 9052f66..0000000 --- a/app/mapbox/mapbox.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>MapPlugin.qml</file> - </qresource> -</RCC> diff --git a/app/navigation.qml b/app/navigation.qml index 2ce1cb6..c4eba78 100644 --- a/app/navigation.qml +++ b/app/navigation.qml @@ -60,7 +60,11 @@ ApplicationWindow { width: parent.width height: parent.height - plugin: MapPlugin { } + plugin: Plugin { + name: "mapbox" + PluginParameter { name: "mapbox.access_token"; + value: fileOperation.getMapAccessToken() } + } center: QtPositioning.coordinate(car_position_lat, car_position_lon) zoomLevel: default_zoom_level bearing: 0 @@ -210,7 +214,12 @@ ApplicationWindow { RouteModel { id: routeModel objectName: "routeModel" - plugin: MapPlugin { } + plugin : Plugin { + name: "mapbox" + PluginParameter { name: "mapbox.access_token"; + value: fileOperation.getMapAccessToken() + } + } query: RouteQuery { id: routeQuery } |