diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-02-22 16:30:23 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-03-23 08:43:33 +0000 |
| commit | 2f100373feff003b3a9f43c9314ea239f38b97b3 (patch) | |
| tree | c8a1c1bdf206185591f3579046f1aac1eb362997 /src/imports | |
| parent | 8f0d2a042458195cebe28f3e80fe9522945b1a14 (diff) | |
| download | qtlocation-2f100373feff003b3a9f43c9314ea239f38b97b3.tar.gz | |
Move locationlabs code into location
The labs feature will still be controlled by location-labs-plugin
config option. They will simply come from the QtLocation module, and
be exposed to QML via the additional qml plugin in
imports/locationlabs.
Change-Id: I133d625708e78ba5d8121a95e45142aae5ec274b
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/imports.pro | 6 | ||||
| -rw-r--r-- | src/imports/locationlabs/locationlabs.cpp | 14 | ||||
| -rw-r--r-- | src/imports/locationlabs/locationlabs.pro | 2 |
3 files changed, 11 insertions, 11 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 1ae5d770..83deb27e 100644 --- a/src/imports/locationlabs/locationlabs.cpp +++ b/src/imports/locationlabs/locationlabs.cpp @@ -34,13 +34,12 @@ ** ****************************************************************************/ -#include <QtLocationLabs/private/qmapiconobject_p.h> -#include <QtLocationLabs/private/qmapobjectview_p.h> -#include <QtLocationLabs/private/qmaprouteobject_p.h> -#include <QtLocationLabs/private/qmapcircleobject_p.h> -#include <QtLocationLabs/private/qmappolygonobject_p.h> -#include <QtLocationLabs/private/qmappolylineobject_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 <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> @@ -74,7 +73,6 @@ public: int minor = 11; // Register the 5.11 types - //qmlRegisterType<QDeclarativeNavigator>(uri, major, minor, "Navigator"); qmlRegisterType<QMapIconObject>(uri, major, minor, "MapIconObject"); qmlRegisterType<QMapObjectView>(uri, major, minor, "MapObjectView"); qmlRegisterType<QMapRouteObject>(uri, major, minor, "MapRouteObject"); 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 |