Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I36abd2a91a470360c87f23a6d8084f908d93e7e0

3 files changed, 6 insertions, 4 deletions

diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
index 545ef608..7e000c06 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/imports/location/qdeclarativegeomap.cpp
@@ -411,6 +411,10 @@ QQuickGeoMapGestureArea *QDeclarativeGeoMap::gesture()
 void QDeclarativeGeoMap::populateMap()
 {
     QObjectList kids = children();
+    QList<QQuickItem *> quickKids = childItems();
+    for (int i=0; i < quickKids.count(); ++i)
+        kids.append(quickKids.at(i));
+
     for (int i = 0; i < kids.size(); ++i) {
         // dispatch items appropriately
         QDeclarativeGeoMapItemView *mapView = qobject_cast<QDeclarativeGeoMapItemView *>(kids.at(i));
@@ -462,7 +466,6 @@ QSGNode *QDeclarativeGeoMap::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDa
     return root;
 }
 
-
 /*!
     \qmlproperty Plugin QtLocation::Map::plugin
 
diff --git a/src/imports/location/qdeclarativegeomapitembase.cpp b/src/imports/location/qdeclarativegeomapitembase.cpp
index cde00abf..8e825f5b 100644
--- a/src/imports/location/qdeclarativegeomapitembase.cpp
+++ b/src/imports/location/qdeclarativegeomapitembase.cpp
@@ -133,6 +133,8 @@ void QDeclarativeGeoMapItemBase::setMap(QDeclarativeGeoMap *quickMap, QGeoMap *m
     if (map_ && quickMap_) {
         connect(map_, SIGNAL(cameraDataChanged(QGeoCameraData)),
                 this, SLOT(baseCameraDataChanged(QGeoCameraData)));
+        connect(quickMap, SIGNAL(heightChanged()), this, SLOT(polishAndUpdate()));
+        connect(quickMap, SIGNAL(widthChanged()), this, SLOT(polishAndUpdate()));
         lastSize_ = QSizeF(quickMap_->width(), quickMap_->height());
         lastCameraData_ = map_->cameraData();
     }
@@ -199,7 +201,6 @@ bool QDeclarativeGeoMapItemBase::childMouseEventFilter(QQuickItem *item, QEvent
     switch (event->type()) {
     case QEvent::MouseButtonPress:
     case QEvent::MouseButtonRelease:
-    case QEvent::MouseMove:
         if (contains(static_cast<QMouseEvent*>(event)->pos())) {
             return false;
         } else {
diff --git a/src/imports/location/qdeclarativegeomapquickitem.cpp b/src/imports/location/qdeclarativegeomapquickitem.cpp
index ca67b183..a66efb1d 100644
--- a/src/imports/location/qdeclarativegeomapquickitem.cpp
+++ b/src/imports/location/qdeclarativegeomapquickitem.cpp
@@ -157,8 +157,6 @@ void QDeclarativeGeoMapQuickItem::setMap(QDeclarativeGeoMap *quickMap, QGeoMap *
 {
     QDeclarativeGeoMapItemBase::setMap(quickMap,map);
     if (map && quickMap) {
-        connect(quickMap, SIGNAL(heightChanged()), this, SLOT(polishAndUpdate()));
-        connect(quickMap, SIGNAL(widthChanged()), this, SLOT(polishAndUpdate()));
         connect(map, SIGNAL(cameraDataChanged(QGeoCameraData)),
                 this, SLOT(polishAndUpdate()));
         polishAndUpdate();