diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-20 08:28:16 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-20 08:28:16 +0200 |
| commit | f5da1a9261d64fdac3b4e12082932cb473098c73 (patch) | |
| tree | bf96e4940ef4f66509589cc31095cf1d8e3b3a2c /tests/auto/quick/qquickitem2 | |
| parent | 0bfcff9d9bd20f3efef6146bd1da6f263b0e24c4 (diff) | |
| parent | dd313c4c5e383827913bbc106f9d19667f2dd149 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/quick/items/qquickitemsmodule.cpp
tests/auto/quick/rendernode/tst_rendernode.cpp
Change-Id: I90582df69feb95a4e4aafb0b9793c23714654f19
Diffstat (limited to 'tests/auto/quick/qquickitem2')
| -rw-r--r-- | tests/auto/quick/qquickitem2/data/mapCoordinates.qml | 10 | ||||
| -rw-r--r-- | tests/auto/quick/qquickitem2/tst_qquickitem.cpp | 8 |
2 files changed, 18 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickitem2/data/mapCoordinates.qml b/tests/auto/quick/qquickitem2/data/mapCoordinates.qml index 4874a51ebb..b410b445c5 100644 --- a/tests/auto/quick/qquickitem2/data/mapCoordinates.qml +++ b/tests/auto/quick/qquickitem2/data/mapCoordinates.qml @@ -59,6 +59,16 @@ Item { return Qt.point(pos.x, pos.y) } + function mapAToGlobal(x, y) { + var pos = itemA.mapToGlobal(x, y) + return Qt.point(pos.x, pos.y) + } + + function mapAFromGlobal(x, y) { + var pos = itemA.mapFromGlobal(x, y) + return Qt.point(pos.x, pos.y) + } + function checkMapAToInvalid(x, y) { try { itemA.mapToItem(1122, x, y) diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index 7130dc4cf2..6554d749dd 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"; |