summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativeflickable.cpp
Commit message (Expand)AuthorAgeFilesLines
* Flickable could flick in wrong direction if given too few touch samplesMartin Jones2011-05-251-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-061-72/+163
|\
| * Improve Flickable dynamics and allow platform specific tweaking.Martin Jones2011-04-061-72/+163
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-011-2/+7
|\ \ | |/
| * PinchArea and Flickable don't work well enough togetherMartin Jones2011-03-311-2/+7
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-3/+5
|\ \ | |/
| * Disabled non-QDeclarativeItems in Flickable break flickingMartin Jones2011-03-161-3/+5
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-091-31/+57
|\ \ | |/
| * Drag over bounds errors when ListView has variable height contentMartin Jones2011-02-281-27/+55
| * fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-281-4/+2
* | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-231-5/+50
|\ \ | |/
| * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-221-2/+2
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-141-1/+6
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-041-2/+2
| | |\ \
| * | | | Prevent recursion due to nested Flickables with pressDelayMartin Jones2011-02-211-4/+44
| | |_|/ | |/| |
| * | | Flickable uses the flick velocity to determine whether to retain grabMartin Jones2011-02-111-1/+6
| |/ /
* | | Merge branch 'mimir' into 4.7David Boddie2011-02-231-1/+1
|\ \ \
| * | | qdoc: Fixed some validation errors in the DITA filesMartin Smith2011-01-191-1/+1
| * | | Merge branch '4.7' into mimirDavid Boddie2010-12-151-2/+2
| |\ \ \
* | \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-041-2/+56
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | Make Flickable's wheel handling more like QAbstractScrollArea.Michael Brasser2011-02-021-2/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-271-1/+1
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-071-2/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Joona Petrell2010-12-201-2/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Allow resizing Flickable content about a center point.Martin Jones2010-11-291-0/+54
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-261-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | positionViewAtIndex can fail when positioned near end of list.Martin Jones2011-01-211-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-131-3/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | |_|/ / | |/| | |
| * | | | Nested flickables would react alternately to flicks.Martin Jones2010-12-231-2/+4
| | |/ / | |/| |
* | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-151-2/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Fix dragging Flickable back over start point.Martin Jones2010-12-131-2/+2
| |/
* | Doc: Used div elements for floats, updated the style sheet.David Boddie2010-12-141-1/+3
* | Doc: Changed floating images to use the new float qdoc macros.David Boddie2010-12-131-3/+1
|/
* Flickable and MouseArea were too eager to take/keep mouse grab.Martin Jones2010-11-241-7/+9
* Doc: clarify Flickable children vs. contentItem children.Martin Jones2010-11-191-0/+7
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-101-11/+10
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-091-6/+3
| |\
| * | Doc: Attempt to document content handling in Flickable.David Boddie2010-11-041-11/+10
* | | Flickable does not reposition its content when it is resized.Martin Jones2010-11-101-0/+14
| |/ |/|
* | Combining ListView.StrictlyEnforceRange and resizing currentItem stalls.Martin Jones2010-11-031-6/+3
|/
* Remove unnecessary roundingAlan Alpert2010-10-211-2/+0
* Flickable 'moving' parameter stays at true when setting contentY.Martin Jones2010-10-211-9/+25
* ListView.visibleArea.heightRatio should not emit a signal when it does not ch...Yann Bodson2010-10-181-7/+18
* Ensure Flickable.contentX and Flickable.contentY return correct values.Martin Jones2010-10-081-2/+2
* Use setParentItem() instead of setParentItemHelper if componentComplete is trueMarco Bubke2010-09-301-5/+19
* Documentation fix for Flickable (mark content properties as real, not int).Michael Brasser2010-09-281-4/+4
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-161-2/+3
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-151-3/+3
| |\