diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-02 11:31:19 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-02 11:31:38 +0100 |
| commit | 77649273d79721a1abb4eabb0d6cedc7e4f17a5a (patch) | |
| tree | 70ac3b1c85f557549305bdd16967ae8b05dbe8aa /src/imports/location | |
| parent | 87d7387c51f564f44602a8d2841d49df2d789e41 (diff) | |
| parent | ee5bf40562aeca6fd861121ab29506cf905189f3 (diff) | |
| download | qtlocation-77649273d79721a1abb4eabb0d6cedc7e4f17a5a.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I07a2f4160750b548dfee882cb9b5b057d83236e2
Diffstat (limited to 'src/imports/location')
| -rw-r--r-- | src/imports/location/location.cpp | 4 | ||||
| -rw-r--r-- | src/imports/location/plugins.qmltypes | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index 4536b371..a0b61d6e 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -166,8 +166,8 @@ public: qmlRegisterUncreatableType<QQuickGeoMapGestureArea, 1>(uri, major, minor, "MapGestureArea", QStringLiteral("(Map)GestureArea is not intended instantiable by developer.")); - // Register the 5.7 types - minor = 7; + // Register the 5.8 types + minor = 8; qmlRegisterType<QDeclarativeGeoManeuver>(uri, major, minor, "RouteManeuver"); // Register the 5.9 types diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes index 4e8749da..b89963ad 100644 --- a/src/imports/location/plugins.qmltypes +++ b/src/imports/location/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtLocation 5.7' +// 'qmlplugindump -nonrelocatable QtLocation 5.8' Module { - dependencies: ["QtQuick 2.0"] + dependencies: ["QtQuick 2.8"] Component { name: "QDeclarativeCategory" prototype: "QObject" @@ -95,7 +95,7 @@ Module { prototype: "QObject" exports: [ "QtLocation/RouteManeuver 5.0", - "QtLocation/RouteManeuver 5.7" + "QtLocation/RouteManeuver 5.8" ] exportMetaObjectRevisions: [0, 0] Enum { |