summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativeflickable.cpp
Commit message (Expand)AuthorAgeFilesLines
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
* Fix warning about vSize not being used in this functionThiago Macieira2011-04-171-1/+1
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-72/+163
|\
| * 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 into qt-master-from-4.7Qt Continuous Integration System2011-04-011-2/+7
|\ \ \ | |/ /
| * | 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 remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-1/+1
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-3/+5
| |\ \ | | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-091-31/+57
| |\ \
| * \ \ Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-231-5/+50
| |\ \ \
| * \ \ \ 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
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-3/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Disabled non-QDeclarativeItems in Flickable break flickingMartin Jones2011-03-161-3/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-011-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 remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-4/+44
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-221-2/+2
| |\ \ \ \ \
| * | | | | | Prevent recursion due to nested Flickables with pressDelayMartin Jones2011-02-211-4/+44
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-171-1/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-141-1/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Flickable uses the flick velocity to determine whether to retain grabMartin Jones2011-02-111-1/+6
| | | |/ / / | | |/| | |
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-261-1/+1
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-131-3/+5
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-151-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
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-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 remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | positionViewAtIndex can fail when positioned near end of list.Martin Jones2011-01-211-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | |_|/ | |/| |
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-231-2/+4
|\ \ \ \ | |/ / /
| * | | Nested flickables would react alternately to flicks.Martin Jones2010-12-231-2/+4
| | |/ | |/|
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-131-2/+2
|\ \ \ | |/ /
| * | Fix dragging Flickable back over start point.Martin Jones2010-12-131-2/+2
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-7/+16
|\ \ | |/
generated by cgit v0.12 at 2025-04-02 19:37:40 (GMT)