diff options
author | David Laing <david.laing@nokia.com> | 2011-12-13 10:56:00 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-13 02:42:43 +0100 |
commit | 0df7a759d0f879822ca5dbfcf238e280ed9e3d5f (patch) | |
tree | 67cdc60dcbe7212b524c3c20112ca24e6fab1d03 /tests/plugins | |
parent | 7ff9af19eed97384269d458d0dc676af22cc844e (diff) | |
download | qtlocation-0df7a759d0f879822ca5dbfcf238e280ed9e3d5f.tar.gz |
Updates pinch generator to use latest touch API.
Some recent changes meant this was failing to compile.
Change-Id: Ib8d37146464fd977bf4ebe72b3254a050b56b08f
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
Reviewed-by: David Laing <david.laing@nokia.com>
Diffstat (limited to 'tests/plugins')
-rw-r--r-- | tests/plugins/declarativetestplugin/qdeclarativepinchgenerator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator.cpp b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator.cpp index 631e085b..87c81c29 100644 --- a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator.cpp +++ b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator.cpp @@ -155,13 +155,14 @@ QTouchEvent::TouchPoint QDeclarativePinchGenerator::createTouchPoint(QEvent::Typ QTouchEvent::TouchPoint QDeclarativePinchGenerator::convertToPrimary(QTouchEvent::TouchPoint original) { QTouchEvent::TouchPoint touchPoint; - touchPoint.setState(original.state() | Qt::TouchPointPrimary); + touchPoint.setState(original.state()); touchPoint.setId(original.id() + 1); touchPoint.setPressure(original.pressure()); touchPoint.setPos(original.pos()); touchPoint.setLastPos(original.lastPos()); touchPoint.setScenePos(original.scenePos()); touchPoint.setLastScenePos(original.lastScenePos()); + touchPoint.setFlags(touchPoint.flags() | QTouchEvent::TouchPoint::Primary); return touchPoint; } |