diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-04-26 10:37:48 +0200 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-04-26 10:37:59 +0200 |
commit | e328d63a0291069dc0948e7c08e1db7aed269f9e (patch) | |
tree | b49c4f6b5f006125a6a88e42d19a7de1eb74dc88 /src/imports | |
parent | 5457317c0ffbbb7e0c285a6899709be78f693b87 (diff) | |
parent | d44838125389720e4352dd51ad1da02f4cb58dc8 (diff) | |
download | qtlocation-e328d63a0291069dc0948e7c08e1db7aed269f9e.tar.gz |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I566c63a233b2b53e89a2ce288bafd8a9a06cc86c
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/imports.pro | 6 | ||||
-rw-r--r-- | src/imports/locationlabs/locationlabs.cpp | 24 | ||||
-rw-r--r-- | src/imports/locationlabs/locationlabs.pro | 2 | ||||
-rw-r--r-- | src/imports/positioning/positioning.cpp | 2 |
4 files changed, 22 insertions, 12 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 2fd8dbd0..b640c791 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,5 +1,7 @@ TEMPLATE = subdirs -qtHaveModule(positioning): SUBDIRS += positioning +QT_FOR_CONFIG += location-private + +qtHaveModule(positioningquick): SUBDIRS += positioning qtHaveModule(location): SUBDIRS += location -qtHaveModule(locationlabs): SUBDIRS += locationlabs +qtHaveModule(location):qtConfig(location-labs-plugin): SUBDIRS += locationlabs diff --git a/src/imports/locationlabs/locationlabs.cpp b/src/imports/locationlabs/locationlabs.cpp index 4b77a2ae..56924b80 100644 --- a/src/imports/locationlabs/locationlabs.cpp +++ b/src/imports/locationlabs/locationlabs.cpp @@ -34,10 +34,13 @@ ** ****************************************************************************/ -//#include <QtLocationLabs/private/qmapiconobject_p.h> -#include <QtLocationLabs/private/qmapobjectview_p.h> -#include <QtLocationLabs/private/qmaprouteobject_p.h> -//#include <QtLocationLabs/private/qdeclarativenavigator_p.h> +#include <QtLocation/private/qmapiconobject_p.h> +#include <QtLocation/private/qmapobjectview_p.h> +#include <QtLocation/private/qmaprouteobject_p.h> +#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> @@ -67,14 +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 -// qmlRegisterType<QDeclarativeNavigator>(uri, major, minor, "Navigator"); -// qmlRegisterType<QMapIconObject>(uri, major, minor, "MapIconObject"); + // 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); diff --git a/src/imports/locationlabs/locationlabs.pro b/src/imports/locationlabs/locationlabs.pro index 618e1492..db7f5ec2 100644 --- a/src/imports/locationlabs/locationlabs.pro +++ b/src/imports/locationlabs/locationlabs.pro @@ -1,4 +1,4 @@ -QT += quick-private network positioning-private location-private locationlabs-private qml-private core-private gui-private +QT += quick-private network positioning-private location-private qml-private core-private gui-private TARGET = locationlabsplugin CXX_MODULE = $$TARGET diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp index 232d2589..6af79b54 100644 --- a/src/imports/positioning/positioning.cpp +++ b/src/imports/positioning/positioning.cpp @@ -591,6 +591,8 @@ public: QMetaType::registerEqualsComparator<QGeoCircle>(); qRegisterMetaType<QGeoPath>(); QMetaType::registerEqualsComparator<QGeoPath>(); + qRegisterMetaType<QGeoPolygon>(); + QMetaType::registerEqualsComparator<QGeoPolygon>(); qRegisterMetaType<QGeoLocation>(); qRegisterMetaType<QGeoShape>(); QMetaType::registerEqualsComparator<QGeoShape>(); |