1 files changed, 14 insertions, 6 deletions
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
index 7130dc4cf2..78322b44a1 100644
--- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
@@ -2355,6 +2355,14 @@ void tst_QQuickItem::mapCoordinates()
             Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y)));
     QCOMPARE(result.value<QPointF>(), qobject_cast<QQuickItem*>(a)->mapFromScene(QPointF(x, y)));
 
+    QVERIFY(QMetaObject::invokeMethod(root, "mapAToGlobal",
+            Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y)));
+    QCOMPARE(result.value<QPointF>(), qobject_cast<QQuickItem*>(a)->mapToGlobal(QPointF(x, y)));
+
+    QVERIFY(QMetaObject::invokeMethod(root, "mapAFromGlobal",
+            Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y)));
+    QCOMPARE(result.value<QPointF>(), qobject_cast<QQuickItem*>(a)->mapFromGlobal(QPointF(x, y)));
+
     QString warning1 = testFileUrl("mapCoordinates.qml").toString() + ":35:5: QML Item: mapToItem() given argument \"1122\" which is neither null nor an Item";
     QString warning2 = testFileUrl("mapCoordinates.qml").toString() + ":35:5: QML Item: mapFromItem() given argument \"1122\" which is neither null nor an Item";
 
@@ -2718,9 +2726,9 @@ struct TestListener : public QQuickItemChangeListener
 {
     TestListener(bool remove = false) : remove(remove) { }
 
-    void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange, const QRectF &diff) override
+    void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange, const QRectF &oldGeometry) override
     {
-        record(item, QQuickItemPrivate::Geometry, diff);
+        record(item, QQuickItemPrivate::Geometry, oldGeometry);
     }
     void itemSiblingOrderChanged(QQuickItem *item) override
     {
@@ -2802,20 +2810,20 @@ void tst_QQuickItem::changeListener()
     item->setImplicitWidth(10);
     QCOMPARE(itemListener.count(QQuickItemPrivate::ImplicitWidth), 1);
     QCOMPARE(itemListener.count(QQuickItemPrivate::Geometry), 1);
-    QCOMPARE(itemListener.value(QQuickItemPrivate::Geometry), QVariant(QRectF(0,0,10,0)));
+    QCOMPARE(itemListener.value(QQuickItemPrivate::Geometry), QVariant(QRectF(0,0,0,0)));
 
     item->setImplicitHeight(20);
     QCOMPARE(itemListener.count(QQuickItemPrivate::ImplicitHeight), 1);
     QCOMPARE(itemListener.count(QQuickItemPrivate::Geometry), 2);
-    QCOMPARE(itemListener.value(QQuickItemPrivate::Geometry), QVariant(QRectF(0,0,0,20)));
+    QCOMPARE(itemListener.value(QQuickItemPrivate::Geometry), QVariant(QRectF(0,0,10,0)));
 
     item->setWidth(item->width() + 30);
     QCOMPARE(itemListener.count(QQuickItemPrivate::Geometry), 3);
-    QCOMPARE(itemListener.value(QQuickItemPrivate::Geometry), QVariant(QRectF(0,0,30,0)));
+    QCOMPARE(itemListener.value(QQuickItemPrivate::Geometry), QVariant(QRectF(0,0,10,20)));
 
     item->setHeight(item->height() + 40);
     QCOMPARE(itemListener.count(QQuickItemPrivate::Geometry), 4);
-    QCOMPARE(itemListener.value(QQuickItemPrivate::Geometry), QVariant(QRectF(0,0,0,40)));
+    QCOMPARE(itemListener.value(QQuickItemPrivate::Geometry), QVariant(QRectF(0,0,40,20)));
 
     item->setOpacity(0.5);
     QCOMPARE(itemListener.count(QQuickItemPrivate::Opacity), 1);