Merge remote-tracking branch 'gerrit/5.8' into dev

Conflicts:
	src/imports/location/qdeclarativegeomap.cpp
	src/location/maps/maps.pri
	src/location/maps/qgeomap_p_p.h
	src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
	src/plugins/geoservices/osm/qgeoroutereplyosm.cpp

Change-Id: I18d31cff9233648178fe3e2636ce294026dfaeb7

1 files changed, 10 insertions, 10 deletions

diff --git a/src/location/maps/qgeomap.cpp b/src/location/maps/qgeomap.cpp
index f8361ee3..ac6d661b 100644
--- a/src/location/maps/qgeomap.cpp
+++ b/src/location/maps/qgeomap.cpp
@@ -51,31 +51,31 @@ QGeoMap::~QGeoMap()
 {
 }
 
-void QGeoMap::setSize(const QSize& size)
+void QGeoMap::setViewportSize(const QSize& size)
 {
     Q_D(QGeoMap);
-    if (size == d->m_size)
+    if (size == d->m_viewportSize)
         return;
-    d->m_size = size;
-    d->changeMapSize(size);
+    d->m_viewportSize = size;
+    d->changeViewportSize(size);
 }
 
-QSize QGeoMap::size() const
+QSize QGeoMap::viewportSize() const
 {
     Q_D(const QGeoMap);
-    return d->m_size;
+    return d->m_viewportSize;
 }
 
-int QGeoMap::width() const
+int QGeoMap::viewportWidth() const
 {
     Q_D(const QGeoMap);
-    return d->m_size.width();
+    return d->m_viewportSize.width();
 }
 
-int QGeoMap::height() const
+int QGeoMap::viewportHeight() const
 {
     Q_D(const QGeoMap);
-    return d->m_size.height();
+    return d->m_viewportSize.height();
 }
 
 void QGeoMap::setCameraData(const QGeoCameraData &cameraData)