Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-07-05 | 1 | -65/+71 |
|\ | |||||
| * | Flicking behaviour of ListView/GridView SnapOnItem is inconsistent | Martin Jones | 2011-07-04 | 1 | -56/+50 |
| * | Velocities reported by Flickable in onFlickStarted can be 0 | Martin Jones | 2011-06-28 | 1 | -9/+21 |
* | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-25 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-25 | 1 | -1/+1 |
| |\ | |||||
| | * | Flickable could flick in wrong direction if given too few touch samples | Martin Jones | 2011-05-25 | 1 | -1/+1 |
| * | | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 1 | -17/+17 |
| |/ | |||||
* | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 1 | -17/+17 |
* | | Fix warning about vSize not being used in this function | Thiago Macieira | 2011-04-17 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-07 | 1 | -72/+163 |
|\ \ | |/ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-06 | 1 | -72/+163 |
| |\ | |||||
| | * | Improve Flickable dynamics and allow platform specific tweaking. | Martin Jones | 2011-04-06 | 1 | -72/+163 |
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-01 | 1 | -2/+7 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-01 | 1 | -2/+7 |
| |\ \ | | |/ | |||||
| | * | PinchArea and Flickable don't work well enough together | Martin Jones | 2011-03-31 | 1 | -2/+7 |
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 1 | -3/+5 |
| |\ \ | | |/ | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-09 | 1 | -31/+57 |
| |\ \ | |||||
| * \ \ | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer... | David Boddie | 2011-02-23 | 1 | -5/+50 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'mimir' into 4.7 | David Boddie | 2011-02-23 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | qdoc: Fixed some validation errors in the DITA files | Martin Smith | 2011-01-19 | 1 | -1/+1 |
| | * | | | | Merge branch '4.7' into mimir | David Boddie | 2010-12-15 | 1 | -2/+2 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-02-04 | 1 | -2/+56 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge remote-tracking branch 'origin/4.7' into HEAD | Thiago Macieira | 2011-03-16 | 1 | -3/+5 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Disabled non-QDeclarativeItems in Flickable break flicking | Martin Jones | 2011-03-16 | 1 | -3/+5 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-01 | 1 | -31/+57 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Drag over bounds errors when ListView has variable height content | Martin Jones | 2011-02-28 | 1 | -27/+55 |
| * | | | | | | fix/improve docs for new QtQuick 1.1 attributes | Bea Lam | 2011-02-28 | 1 | -4/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-23 | 1 | -4/+44 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7 | Joona Petrell | 2011-02-22 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| * | | | | | | Prevent recursion due to nested Flickables with pressDelay | Martin Jones | 2011-02-21 | 1 | -4/+44 |
* | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-17 | 1 | -1/+6 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-14 | 1 | -1/+6 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Flickable uses the flick velocity to determine whether to retain grab | Martin Jones | 2011-02-11 | 1 | -1/+6 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-02-04 | 1 | -2/+2 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-01-26 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '4.7' of ../qt into 4.7 | David Boddie | 2011-01-13 | 1 | -3/+5 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-12-15 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| | | |||||
| | * | | | | Doc: Used div elements for floats, updated the style sheet. | David Boddie | 2010-12-14 | 1 | -1/+3 |
| | * | | | | Doc: Changed floating images to use the new float qdoc macros. | David Boddie | 2010-12-13 | 1 | -3/+1 |
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-04 | 1 | -2/+56 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Make Flickable's wheel handling more like QAbstractScrollArea. | Michael Brasser | 2011-02-02 | 1 | -2/+2 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Bea Lam | 2011-01-27 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-19 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-07 | 1 | -2/+4 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Joona Petrell | 2010-12-20 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Allow resizing Flickable content about a center point. | Martin Jones | 2010-11-29 | 1 | -0/+54 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | positionViewAtIndex can fail when positioned near end of list. | Martin Jones | 2011-01-21 | 1 | -1/+1 |
| | |_|_|/ | |/| | | |