diff options
author | Alex Wilson <alex.wilson@nokia.com> | 2012-02-24 13:25:18 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 06:11:41 +0100 |
commit | 9628d6de358ffd74600ded8024775c4c8bdd3042 (patch) | |
tree | 3d979bab5800dbac097be46a3dd7885513f7277c /src/location/maps/qgeomap.cpp | |
parent | af00ab8e9909b80c03550694d567679fe28b00ca (diff) | |
download | qtlocation-9628d6de358ffd74600ded8024775c4c8bdd3042.tar.gz |
Expose camera caps via QGeoMap, add isValid() method to camera caps
This is useful to the QML plugin, so that map objects can be aware
of what camera actions to expect from their parent map. The isValid()
method is necessary so that callers can tell the difference between
a default, empty QGeoCameraCapabilities, and one actually populated
by a backend plugin.
Change-Id: I7e742fee5bac9f003e0cc99e4c3d6a747a67ea24
Reviewed-by: David Laing <david.laing@nokia.com>
Diffstat (limited to 'src/location/maps/qgeomap.cpp')
-rw-r--r-- | src/location/maps/qgeomap.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/location/maps/qgeomap.cpp b/src/location/maps/qgeomap.cpp index 84471d0f..0b937f98 100644 --- a/src/location/maps/qgeomap.cpp +++ b/src/location/maps/qgeomap.cpp @@ -152,6 +152,15 @@ QGeoCameraData QGeoMap::cameraData() const return d->cameraData(); } +QGeoCameraCapabilities QGeoMap::cameraCapabilities() const +{ + Q_D(const QGeoMap); + if (d->manager()) + return d->manager()->cameraCapabilities(); + else + return QGeoCameraCapabilities(); +} + void QGeoMap::update() { emit updateRequired(); @@ -336,6 +345,11 @@ QGeoCameraData QGeoMapPrivate::cameraData() const return cameraData_; } +QGeoMappingManager *QGeoMapPrivate::manager() const +{ + return manager_; +} + void QGeoMapPrivate::resize(int width, int height) { width_ = width; |