diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2012-06-06 09:19:09 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-07 03:05:34 +0200 |
| commit | 5e8bdd51c889403db99d0dbad908b6e862252a70 (patch) | |
| tree | 7dc34fce9b8996b8a380d7719b28dee9842ef5f9 /src/plugins/geoservices/nokia | |
| parent | 702a9d73fa145fd107c8a3f03d68d93b6968af77 (diff) | |
| download | qtlocation-5e8bdd51c889403db99d0dbad908b6e862252a70.tar.gz | |
Remove Maps from public C++ API.
The preliminary C++ Maps API was exposed to provide an interface
between the QML plugin and the geo services plugins. Mark it as
private API for now as it is likely to change when the full C++ API is
developed.
Mapping functionality is currently only available through QML.
Change-Id: Id16e0f1a2165c70192047dffa40e69ab1f29ba69
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
Diffstat (limited to 'src/plugins/geoservices/nokia')
6 files changed, 10 insertions, 9 deletions
diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro index 88394c7d..f96c3638 100644 --- a/src/plugins/geoservices/nokia/nokia.pro +++ b/src/plugins/geoservices/nokia/nokia.pro @@ -1,7 +1,7 @@ load(qt_module) TARGET = qtgeoservices_nokia -QT += location network +QT += location-private network contains(QT_CONFIG, location-china-support) { # China support diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h index 587d255b..9d036278 100644 --- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h +++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h @@ -49,9 +49,9 @@ #ifndef QGEOMAPREPLY_NOKIA_H #define QGEOMAPREPLY_NOKIA_H -#include <qgeotilespec.h> -#include <qgeotiledmapreply.h> -#include <QNetworkReply> +#include <QtNetwork/QNetworkReply> +#include <QtLocation/private/qgeotilespec_p.h> +#include <QtLocation/private/qgeotiledmapreply_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp index 1a72f52c..f17be015 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp @@ -50,7 +50,7 @@ #include "qgeotiledmappingmanagerengine_nokia.h" #include "qgeotiledmapdata_nokia.h" #include "qgeotilefetcher_nokia.h" -#include "qgeotilespec.h" +#include "qgeotilespec_p.h" #include "qgeoprojection_p.h" #include "qdoublevector2d_p.h" #include "qgeotilecache_p.h" diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h index 3b518084..693b9266 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h @@ -49,9 +49,9 @@ #ifndef QGEOTILEDMAPPINGMANAGERENGINE_NOKIA_H #define QGEOTILEDMAPPINGMANAGERENGINE_NOKIA_H -#include "qgeotiledmappingmanagerengine.h" +#include "qgeotiledmappingmanagerengine_p.h" #include "qgeoboundingbox.h" -#include "qgeomaptype.h" +#include "qgeomaptype_p.h" #include <QGeoServiceProvider> diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp index f90b1c4a..eb991f7d 100644 --- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp @@ -54,7 +54,7 @@ #include "qgeouriprovider.h" #include "uri_constants.h" -#include <qgeotilespec.h> +#include <QtLocation/private/qgeotilespec_p.h> #include <QDebug> #include <QSize> diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h index eb5f02b7..578cf551 100644 --- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h +++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h @@ -50,7 +50,8 @@ #define QGEOTILEFETCHER_NOKIA_H #include "qgeoserviceproviderplugin_nokia.h" -#include "qgeotilefetcher.h" + +#include <QtLocation/private/qgeotilefetcher_p.h> QT_BEGIN_NAMESPACE |