diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-11-29 12:56:57 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-12-04 17:51:17 +0000 |
| commit | 3d5b126091ca28e014d1fd3662244284498107c9 (patch) | |
| tree | e5e4f34b4040dee25b56494d806d7702dc769aaf /src/location | |
| parent | 4919bb49039dd84bd58290fb66e2c272a920929c (diff) | |
| download | qtlocation-3d5b126091ca28e014d1fd3662244284498107c9.tar.gz | |
Move declarative positioning classes to positioningquick, fix exports
QDeclarativeGeoLocation and QDeclarativeGeoAddress were incorrectly
publicly exported (Q_POSITIONING_EXPORT) in QtPositioning, for using
them in QtLocation (geocodemodel, declarativeplace), although they
are private classes.
This patch moves them into positioningquick, that, now that is
available, is supposed to contain all the declarative positioning types.
The patch also correctly privately export these types.
Change-Id: I1bde17026fe122860e8977a98262c0707939c227
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/location')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeocodemodel_p.h | 4 | ||||
| -rw-r--r-- | src/location/declarativeplaces/qdeclarativeplace_p.h | 2 | ||||
| -rw-r--r-- | src/location/location.pro | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeocodemodel_p.h b/src/location/declarativemaps/qdeclarativegeocodemodel_p.h index 6c8f533b..e2361045 100644 --- a/src/location/declarativemaps/qdeclarativegeocodemodel_p.h +++ b/src/location/declarativemaps/qdeclarativegeocodemodel_p.h @@ -52,8 +52,8 @@ #include <QtLocation/private/qdeclarativegeoserviceprovider_p.h> #include <QtLocation/qgeocodereply.h> -#include <QtPositioning/private/qdeclarativegeoaddress_p.h> -#include <QtPositioning/private/qdeclarativegeolocation_p.h> +#include <QtPositioningQuick/private/qdeclarativegeoaddress_p.h> +#include <QtPositioningQuick/private/qdeclarativegeolocation_p.h> #include <QtQml/qqml.h> #include <QtQml/QQmlParserStatus> diff --git a/src/location/declarativeplaces/qdeclarativeplace_p.h b/src/location/declarativeplaces/qdeclarativeplace_p.h index 67d2c8df..309bd64c 100644 --- a/src/location/declarativeplaces/qdeclarativeplace_p.h +++ b/src/location/declarativeplaces/qdeclarativeplace_p.h @@ -55,7 +55,7 @@ #include <QtQml/QQmlPropertyMap> #include <QtLocation/QPlace> -#include <QtPositioning/private/qdeclarativegeolocation_p.h> +#include <QtPositioningQuick/private/qdeclarativegeolocation_p.h> #include <QtLocation/private/qdeclarativecategory_p.h> #include <QtLocation/private/qdeclarativecontactdetail_p.h> #include <QtLocation/private/qdeclarativesupplier_p.h> diff --git a/src/location/location.pro b/src/location/location.pro index 1535a85e..1b541b9e 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -1,5 +1,5 @@ TARGET = QtLocation -QT = core-private positioning-private +QT = core-private positioning-private positioningquick-private android { # adding qtconcurrent dependency here for the osm plugin QT += concurrent |