remove duplicated code and API (merge QTouchEvent and QGraphicsSceneTouchEvent)

the API for these 2 classes is identical, the implementation is almost
identical, they share the same data structures, so bite the bullet and
merge them.

this means we go back to using screenPos() instead of globalPos()
again

1 files changed, 3 insertions, 3 deletions

diff --git a/src/testlib/qtesttouch.h b/src/testlib/qtesttouch.h
index 2db015a..141cb4d 100644
--- a/src/testlib/qtesttouch.h
+++ b/src/testlib/qtesttouch.h
@@ -78,21 +78,21 @@ namespace QTest
         QTouchEventSequence& press(int touchId, const QPoint &pt, QWidget *widget = 0)
         {
             QTouchEvent::TouchPoint &p = point(touchId);
-            p.setGlobalPos(mapToScreen(widget, pt));
+            p.setScreenPos(mapToScreen(widget, pt));
             p.setState(Qt::TouchPointPressed);
             return *this;
         }
         QTouchEventSequence& move(int touchId, const QPoint &pt, QWidget *widget = 0)
         {
             QTouchEvent::TouchPoint &p = point(touchId);
-            p.setGlobalPos(mapToScreen(widget, pt));
+            p.setScreenPos(mapToScreen(widget, pt));
             p.setState(Qt::TouchPointMoved);
             return *this;
         }
         QTouchEventSequence& release(int touchId, const QPoint &pt, QWidget *widget = 0)
         {
             QTouchEvent::TouchPoint &p = point(touchId);
-            p.setGlobalPos(mapToScreen(widget, pt));
+            p.setScreenPos(mapToScreen(widget, pt));
             p.setState(Qt::TouchPointReleased);
             return *this;
         }