summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativepincharea.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-011-107/+129
|\
| * PinchArea and Flickable don't work well enough togetherMartin Jones2011-03-311-107/+129
| | | | | | | | | | | | | | | | | | Allow PinchArea to be more aggressive in grabbing the gesture and keep the gesture until all touches are released. Change-Id: Ic80b7c4c478e1ee3b1c3da0772553756d9d5473f Task-number: QTBUG-17829 Reviewed-by: Bea Lam
* | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-111-1/+1
|\ \ | |/ |/| | | | | Conflicts: src/s60installs/eabi/QtOpenVGu.def
| * Update copyright year to 2011.Rohan McGovern2011-03-101-1/+1
| | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* | The rotation reported by PinchArea should not be in the range -180..180Martin Jones2011-03-091-7/+10
|/ | | | | | | | | | | The rotation is the total rotation that has been applied since the gesture started. This should not be normalized to -180 to 180. If you contort your fingers such that you have rotated 420deg then that is what should be reported. Change-Id: I24ba3f105befc2b0d31f1933911a94a0152ffcb4 Task-number: QTBUG-17437 Reviewed-by: Bea Lam
* PinchArea sometimes failed.Martin Jones2011-02-011-1/+4
| | | | | | | | Almost always failed on Mac and could fail on other systems due to QDeclarativePinchEvent::m_accepted not being initialized. Task-number: QTBUG-15491 Reviewed-by: Bea Lam
* PinchArea API changes following review.Martin Jones2011-01-071-21/+21
| | | | | Task-number: QTBUG-15491 Reviewed-by: Michael Brasser
* Add PinchArea.Martin Jones2010-11-281-0/+579
Provides two finger gestures: zoom, rotate, pan. Task-number: QTBUG-15491 Reviewed-by: Aaron Kennedy