From dc5c8d1099ac851b51accf5f87c5be4fc1610c1a Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sat, 25 Feb 2012 12:54:58 +1100 Subject: Specify global mouse position for QDeclarativeMouseArea auto test The preventContextMenu QDeclarativeMouseArea auto test creates QContextMenuEvent without specifying the global mouse position. As a result, the event's global mouse position is incorrectly set to QCursor::pos(). Change-Id: Ib67fbcf3acf968eb2748426ad0db0e900826b232 Reviewed-by: Martin Jones (cherry picked from commit f323f01648a33a22ba2b0f4975efe19a1af1b9b5) --- .../qdeclarativemousearea/tst_qdeclarativemousearea.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/auto/declarative/qdeclarativemousearea') diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp index 624e5595..811fcd46 100644 --- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp +++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp @@ -682,20 +682,21 @@ void tst_QDeclarativeMouseArea::preventContextMenu() QCOMPARE(eventsReceived.read().toInt(), 0); QPoint targetPoint = view->mapFromScene(QPoint(80, 80)); + QPoint targetGlobalPoint = view->viewport()->mapToGlobal(targetPoint); - QContextMenuEvent fakeEvent1(QContextMenuEvent::Mouse, targetPoint); + QContextMenuEvent fakeEvent1(QContextMenuEvent::Mouse, targetPoint, targetGlobalPoint); QApplication::sendEvent(view->viewport(), &fakeEvent1); QCOMPARE(eventsReceived.read().toInt(), 0); mouseAreaEnabled.write(false); QVERIFY(!mouseAreaEnabled.read().toBool()); - QContextMenuEvent fakeEvent2(QContextMenuEvent::Mouse, targetPoint); + QContextMenuEvent fakeEvent2(QContextMenuEvent::Mouse, targetPoint, targetGlobalPoint); QApplication::sendEvent(view->viewport(), &fakeEvent2); QCOMPARE(eventsReceived.read().toInt(), 1); mouseAreaEnabled.write(true); QVERIFY(mouseAreaEnabled.read().toBool()); - QContextMenuEvent fakeEvent3(QContextMenuEvent::Mouse, targetPoint); + QContextMenuEvent fakeEvent3(QContextMenuEvent::Mouse, targetPoint, targetGlobalPoint); QApplication::sendEvent(view->viewport(), &fakeEvent3); QCOMPARE(eventsReceived.read().toInt(), 1); } -- cgit v1.2.3