Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3

 Conflicts:
	.qmake.conf

Change-Id: I9a3d7ec0bb203ac8b5bd483af3973510ca33c4a9

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/auto/declarative_ui/tst_map.qml b/tests/auto/declarative_ui/tst_map.qml
index 8b101bf1..f05b2c72 100644
--- a/tests/auto/declarative_ui/tst_map.qml
+++ b/tests/auto/declarative_ui/tst_map.qml
@@ -72,6 +72,7 @@ Item {
                                 && coordinateMap.mapReady
                                 && mapTiltBearing.mapReady
                                 && mapTiltBearingHere.mapReady
+                                && mapTestProjection.mapReady
 
     Map { id: mapZoomOnCompleted; width: 200; height: 200;
         zoomLevel: 3; center: coordinate1; plugin: testPlugin;
@@ -113,6 +114,13 @@ Item {
         plugin: testPluginLazyParameter
     }
 
+    Map {
+        id: mapTestProjection
+        plugin: testPlugin
+        width: 200
+        height: 200
+    }
+
     MapParameter {
         id: testParameter
         type: "cameraCenter_test"
@@ -661,6 +669,20 @@ Item {
             coord = coordinateMap.toCoordinate(Qt.point(-5, -6))
             verify(isNaN(coord.latitude))
             verify(isNaN(coord.longitde))
+
+            // test with tilting
+            coord = QtPositioning.coordinate(45.6, 17.67)
+            var pos = mapTestProjection.fromCoordinate(coord, false)
+            compare(Math.floor(pos.x), 3339)
+            compare(Math.floor(pos.y), 1727)
+            mapTestProjection.tilt = 6
+            pos = mapTestProjection.fromCoordinate(coord, false)
+            compare(Math.floor(pos.x), 11066)
+            compare(Math.floor(pos.y), 5577)
+            mapTestProjection.tilt = 12
+            pos = mapTestProjection.fromCoordinate(coord, false)
+            verify(isNaN(pos.latitude))
+            verify(isNaN(pos.longitde))
         }
     }
 }