summaryrefslogtreecommitdiff
path: root/src/imports/locationlabs/locationlabs.cpp
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2018-01-19 18:52:14 +0100
committerPaolo Angelelli <paolo.angelelli@qt.io>2018-04-17 11:16:59 +0000
commit6909660b73b40681211493a039e72a701d5b4462 (patch)
tree85d3d59e8e2123f3b26c0dbe5cd23785ae7539ef /src/imports/locationlabs/locationlabs.cpp
parent6c6a9e787c2e1443fc4318482504e672a6ca386e (diff)
downloadqtlocation-6909660b73b40681211493a039e72a701d5b4462.tar.gz
Introduce Navigator QML type
A new QML type, Navigator, is introduced in Qt.labs.location Its intended purpose is to be a front-end for the functionalities offered by NavigationManagerEngines. Change-Id: Ic93bed0bfaaf32453e759b12a348fa6ef1ae2c93 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/imports/locationlabs/locationlabs.cpp')
-rw-r--r--src/imports/locationlabs/locationlabs.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/imports/locationlabs/locationlabs.cpp b/src/imports/locationlabs/locationlabs.cpp
index 83deb27e..56924b80 100644
--- a/src/imports/locationlabs/locationlabs.cpp
+++ b/src/imports/locationlabs/locationlabs.cpp
@@ -40,6 +40,7 @@
#include <QtLocation/private/qmapcircleobject_p.h>
#include <QtLocation/private/qmappolygonobject_p.h>
#include <QtLocation/private/qmappolylineobject_p.h>
+#include <QtLocation/private/qdeclarativenavigator_p.h>
#include <QtQml/qqmlextensionplugin.h>
#include <QtQml/qqml.h>
@@ -69,16 +70,17 @@ public:
if (QLatin1String(uri) == QLatin1String("Qt.labs.location")) {
// @uri QtLocationLabs
- int major = 5;
- int minor = 11;
+ int major = 1;
+ int minor = 0;
- // Register the 5.11 types
+ // Register the 1.0 labs types
qmlRegisterType<QMapIconObject>(uri, major, minor, "MapIconObject");
qmlRegisterType<QMapObjectView>(uri, major, minor, "MapObjectView");
qmlRegisterType<QMapRouteObject>(uri, major, minor, "MapRouteObject");
qmlRegisterType<QMapCircleObject>(uri, major, minor, "MapCircleObject");
qmlRegisterType<QMapPolygonObject>(uri, major, minor, "MapPolygonObject");
qmlRegisterType<QMapPolylineObject>(uri, major, minor, "MapPolylineObject");
+ qmlRegisterType<QDeclarativeNavigator>(uri, major, minor, "Navigator");
// Register the latest Qt version as QML type version
qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR);