Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	.qmake.conf

Change-Id: I3241efba9c3a32a4a097a67fd6432c45aad8e6ef

1 files changed, 14 insertions, 3 deletions

diff --git a/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp b/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp
index cb5cce9a..86d67cf8 100644
--- a/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp
@@ -393,9 +393,20 @@ void QDeclarativeGeoMapQuickItem::updatePolish()
         matrix_->setMatrix(map()->geoProjection().quickItemTransformation(coordinate(), anchorPoint_, zoomLevel_));
         setPosition(QPointF(0,0));
     } else {
-        if (matrix_)
-            matrix_->setMatrix(QMatrix4x4());
-        setPositionOnMap(coordinate(), anchorPoint_);
+        // if the coordinate is behind the camera, we use the transformation to get the item out of the way
+        if (map()->cameraData().tilt() > 0.0
+            && !map()->geoProjection().isProjectable(map()->geoProjection().geoToWrappedMapProjection(coordinate()))) {
+            if (!matrix_) {
+                matrix_ = new QMapQuickItemMatrix4x4(this);
+                matrix_->appendToItem(opacityContainer_);
+            }
+            matrix_->setMatrix(map()->geoProjection().quickItemTransformation(coordinate(), anchorPoint_, map()->cameraData().zoomLevel()));
+            setPosition(QPointF(0,0));
+        } else {
+            if (matrix_)
+                matrix_->setMatrix(QMatrix4x4());
+            setPositionOnMap(coordinate(), anchorPoint_);
+        }
     }
 }