QPoint p1(80, 80);
QPoint p2(100, 100);
- QTest::touchEvent(vp).press(0, p1);
- QTest::touchEvent(vp).stationary(0).press(1, p2);
+ QTest::touchEvent(vp).press(0, p1, canvas);
+ QTest::touchEvent(vp).stationary(0).press(1, p2, canvas);
p1 -= QPoint(10,10);
p2 += QPoint(10,10);
- QTest::touchEvent(vp).move(0, p1).move(1, p2);
+ QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas);
QCOMPARE(root->property("scale").toReal(), 1.0);
p1 -= QPoint(10,10);
p2 += QPoint(10,10);
- QTest::touchEvent(vp).move(0, p1).move(1, p2);
+ QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas);
QCOMPARE(root->property("scale").toReal(), 1.5);
QCOMPARE(root->property("center").toPointF(), QPointF(40, 40)); // blackrect is at 50,50
// scale beyond bound
p1 -= QPoint(50,50);
p2 += QPoint(50,50);
- QTest::touchEvent(vp).move(0, p1).move(1, p2);
+ QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas);
QCOMPARE(blackRect->scale(), 2.0);
- QTest::touchEvent(vp).release(0, p1).release(1, p2);
+ QTest::touchEvent(vp).release(0, p1, canvas).release(1, p2, canvas);
delete canvas;
}
QPoint p1(80, 80);
QPoint p2(100, 100);
- QTest::touchEvent(vp).press(0, p1);
- QTest::touchEvent(vp).stationary(0).press(1, p2);
+ QTest::touchEvent(vp).press(0, p1, canvas);
+ QTest::touchEvent(vp).stationary(0).press(1, p2, canvas);
p1 += QPoint(10,10);
p2 += QPoint(10,10);
- QTest::touchEvent(vp).move(0, p1).move(1, p2);
+ QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas);
QCOMPARE(root->property("scale").toReal(), 1.0);
p1 += QPoint(10,10);
p2 += QPoint(10,10);
- QTest::touchEvent(vp).move(0, p1).move(1, p2);
+ QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas);
QCOMPARE(root->property("center").toPointF(), QPointF(60, 60)); // blackrect is at 50,50
// pan x beyond bound
p1 += QPoint(100,100);
p2 += QPoint(100,100);
- QTest::touchEvent(vp).move(0, p1).move(1, p2);
+ QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas);
QCOMPARE(blackRect->x(), 140.0);
QCOMPARE(blackRect->y(), 160.0);
- QTest::touchEvent(vp).release(0, p1).release(1, p2);
+ QTest::touchEvent(vp).release(0, p1, canvas).release(1, p2, canvas);
delete canvas;
}
// begin by moving one touch point (mouse)
QTest::mousePress(vp, Qt::LeftButton, 0, canvas->mapFromScene(p1));
- QTest::touchEvent(vp).press(0, p1);
+ QTest::touchEvent(vp).press(0, p1, canvas);
{
p1 -= QPoint(10,10);
QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(p1), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
QApplication::sendEvent(canvas->viewport(), &mv);
- QTest::touchEvent(vp).move(0, p1);
+ QTest::touchEvent(vp).move(0, p1, canvas);
}
{
p1 -= QPoint(10,10);
QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(p1), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
QApplication::sendEvent(vp, &mv);
- QTest::touchEvent(vp).move(0, p1);
+ QTest::touchEvent(vp).move(0, p1, canvas);
}
{
p1 -= QPoint(10,10);
QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(p1), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
QApplication::sendEvent(vp, &mv);
- QTest::touchEvent(vp).move(0, p1);
+ QTest::touchEvent(vp).move(0, p1, canvas);
}
// Flickable has reacted to the gesture
QVERIFY(root->property("scale").toReal() == 1.0);
// add another touch point and continue moving
- QTest::touchEvent(vp).stationary(0).press(1, p2);
+ QTest::touchEvent(vp).stationary(0).press(1, p2, canvas);
p1 -= QPoint(10,10);
p2 += QPoint(10,10);
- QTest::touchEvent(vp).move(0, p1).move(1, p2);
+ QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas);
QCOMPARE(root->property("scale").toReal(), 1.0);
p1 -= QPoint(10,10);
p2 += QPoint(10,10);
- QTest::touchEvent(vp).move(0, p1).move(1, p2);
+ QTest::touchEvent(vp).move(0, p1, canvas).move(1, p2, canvas);
// PinchArea has stolen the gesture.
QVERIFY(!root->isMoving());
QVERIFY(root->property("scale").toReal() > 1.0);
QTest::mouseRelease(vp, Qt::LeftButton, 0, canvas->mapFromScene(p1));
- QTest::touchEvent(vp).release(0, p1).release(1, p2);
+ QTest::touchEvent(vp).release(0, p1, canvas).release(1, p2, canvas);
delete canvas;
}