summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativegridview.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-07-051-31/+66
|\
| * Flicking behaviour of ListView/GridView SnapOnItem is inconsistentMartin Jones2011-07-041-31/+66
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-171-17/+9
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-091-1/+3
| |\ \ | | |/
| | * ListView segmentation fault when setting highlight to nullMartin Jones2011-05-301-1/+3
| * | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-311-16/+6
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-271-16/+6
| | |\
| | | * Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-271-16/+6
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-171-17/+17
| | |\ \ | | | |/ | | |/|
| | | * Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-241-17/+20
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-0/+3
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-061-0/+3
| | |\ \ \ | | | |/ /
| | | * | Views do not notify count changes properlyMartin Jones2011-05-051-0/+3
| | | |/
| * | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| |/ /
* | | Doc: Fixed qdoc warnings.David Boddie2011-05-111-1/+1
|/ /
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-1/+21
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-151-1/+1
| |\
| | * Fix uninitialized variable.Martin Jones2011-04-141-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-141-0/+20
| |\ \ | | |/
| | * Moving contentY by large values in List/GridView is slowMartin Jones2011-04-141-0/+20
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-1/+2
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-061-1/+2
| |\ \ | | |/
| | * Improve Flickable dynamics and allow platform specific tweaking.Martin Jones2011-04-061-1/+2
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-3/+3
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-301-1/+1
| |\ \ | | |/
| | * GridView jumps to beginning of list when resizedMartin Jones2011-03-291-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-127/+458
| |\ \ | | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-091-8/+12
| |\ \
| * \ \ Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-281-2/+2
| |\ \ \
| * \ \ \ Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-231-33/+29
| |\ \ \ \
| * \ \ \ \ Merge branch 'mimir' into 4.7David Boddie2011-02-231-2/+2
| |\ \ \ \ \
| | * | | | | qdoc: Fixed some validation errors in the DITA filesMartin Smith2011-01-191-2/+2
| | * | | | | Merge branch '4.7' into mimirDavid Boddie2010-12-151-5/+9
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-041-58/+117
| |\ \ \ \ \ \ \
* | | | | | | | | Fix warning about maybe-uninitialised use of variableThiago Macieira2011-03-221-0/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Regression: currentIndex was not set correctly after model cleared.Martin Jones2011-03-151-3/+3
* | | | | | | | Fix documentation talking about old property LayoutMirror::mirrorJoona Petrell2011-03-071-1/+1
* | | | | | | | Merge branch '4.7' into qtquick11Martin Jones2011-03-011-14/+18
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Drag over bounds errors when ListView has variable height contentMartin Jones2011-02-281-8/+11
| * | | | | | | fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-281-0/+1
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | ListView and GridView indexAt should use qreal coordinates.Martin Jones2011-02-231-2/+2
| | |_|_|_|/ | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-091-31/+25
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-071-2/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-041-4/+4
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | / / / | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-261-2/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-131-1/+10
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-151-5/+9
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | / | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Doc: Fixed an old-style float.David Boddie2010-12-151-1/+3
| | * | | | | | Doc: Used div elements for floats, updated the style sheet.David Boddie2010-12-141-1/+3