summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@qt.io>2016-12-01 10:53:38 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2016-12-07 05:51:36 +0000
commit41cc347040226d2c5c16b9df001d03f2724b87e5 (patch)
tree0a47c2e9d2e3d501404d763674ca788d34290eb1
parent88b355069c6124fb3d23a9e7d96ff3eacfb6a23d (diff)
Update QtLocation and QtPositioning QML versions for 5.8 releasev5.8.0-rc1v5.8.0
Change-Id: I780c23ae48c548e799c853cd3a5ac1aa77586839 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--src/imports/location/location.cpp4
-rw-r--r--src/imports/location/plugins.qmltypes6
-rw-r--r--src/imports/positioning/plugins.qmltypes6
-rw-r--r--src/imports/positioning/positioning.cpp6
4 files changed, 11 insertions, 11 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 6405313b..a2428b4c 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -162,8 +162,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");
//registrations below are version independent
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 {
diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes
index 55fcbba2..ace5bfae 100644
--- a/src/imports/positioning/plugins.qmltypes
+++ b/src/imports/positioning/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 QtPositioning 5.7'
+// 'qmlplugindump -nonrelocatable QtPositioning 5.8'
Module {
- dependencies: ["QtQuick 2.0"]
+ dependencies: ["QtQuick 2.8"]
Component {
name: "LocationSingleton"
prototype: "QObject"
@@ -106,7 +106,7 @@ Module {
"QtPositioning/Position 5.0",
"QtPositioning/Position 5.3",
"QtPositioning/Position 5.4",
- "QtPositioning/Position 5.7"
+ "QtPositioning/Position 5.8"
]
exportMetaObjectRevisions: [0, 1, 2, 2]
Property { name: "latitudeValid"; type: "bool"; isReadonly: true }
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 4c54c211..f8e1840f 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -548,12 +548,12 @@ public:
qmlRegisterType<QQuickGeoCoordinateAnimation >(uri, major, minor, "CoordinateAnimation");
qmlRegisterType<QDeclarativePosition, 1 >(uri, major, minor, "Position");
- // Register the 5.4 types
- // Introduction of 5.4 version; existing 5.3 exports become automatically available under 5.4
minor = 4;
qmlRegisterType<QDeclarativePosition, 2>(uri, major, minor, "Position");
- minor = 7;
+ // Register the 5.8 types
+ // Introduction of 5.8 version; existing 5.4 exports become automatically available under 5.8
+ minor = 8;
qmlRegisterType<QDeclarativePosition, 2>(uri, major, minor, "Position");
} else {
qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri);