Merge remote-tracking branch 'origin/5.12.2' into 5.12

Change-Id: I2d9e5f32cc238b9d2276ff85f12946a54bee2263

tests/auto/declarative_ui/tst_map_error.qml

@@ -147,9 +147,9 @@ Item {
         function test_map_toCoordinate()
         {
             map_no_plugin.center = coordinate
-            compare(map_no_plugin.toCoordinate(50,50).isValid,false)
+            compare(map_no_plugin.toCoordinate(Qt.point(50,50)).isValid,false)
             map_error_plugin.center = coordinate
-            compare(map_error_plugin.toCoordinate(50,50).isValid,false)
+            compare(map_error_plugin.toCoordinate(Qt.point(50,50)).isValid,false)
         }
 
         function test_map_fromCoordinate()

tests/auto/declarative_ui/tst_map_item.qml

@@ -443,7 +443,7 @@ Item {
             map.center = preMapCircle.center
             verify(LocationTestHelper.waitForPolished(map))
             point = map.fromCoordinate(preMapCircle.center)
-            targetCoordinate = map.toCoordinate(51, 51)
+            targetCoordinate = map.toCoordinate(Qt.point(51, 51))
             mousePress(map, point.x, point.y)
             for (i = 0; i < 50; i += 1) {
                 wait(1)