summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-upstream'Thierry Bastian2011-03-103-12/+15
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-012-7/+9
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-252-7/+9
| | |\
| | | * QSortFilterProxyModel::reset() should invalidate.Olivier Goffart2011-02-252-7/+9
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-5/+6
| |\ \ \ | | |/ /
| | * | Fix crash in KPackageKitGabriel de Dietrich2011-02-151-5/+6
* | | | Merge branch 'master-upstream'Gabriel de Dietrich2011-02-151-2/+2
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-2/+2
| |\ \ \ | | |/ /
| | * | Doc: Fixed confusing wording of a sentence.David Boddie2011-01-271-2/+2
| | |/
* | | Merge branch 'master-upstream' into master-waterThierry Bastian2011-01-2066-68/+75
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1766-68/+75
| |\ \ | | |/
| | * Update copyright year to 2011.Jason McDonald2011-01-1066-66/+66
| | * Fix timer warning when deleting item viewsGabriel de Dietrich2010-12-211-2/+9
* | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-221-0/+2
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-201-0/+2
| |\ \ | | |/
| | * Suppress a warning about killing a timer that isn't active.Thiago Macieira2010-12-151-0/+2
* | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-151-2/+2
|\ \ \ | |/ /
| * | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Olivier Goffart2010-12-131-1/+1
| |\ \
| * \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-272-3/+3
| | |\ \
| | * | | Fix filtering of columns in QSFPM.Stephen Kelly2010-11-231-2/+2
* | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-141-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-111-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | We should not cache ICO files.Alexis Menard2010-12-101-1/+1
* | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-112-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-062-3/+3
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-11-262-3/+3
| | |\ \ | | | |/ | | |/|
| | | * Doc: fix typoJoerg Bornemann2010-11-262-3/+3
* | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-053-0/+47
|\ \ \ \ | |/ / /
| * | | QScroller merge, part 1Robert Griebl2010-12-023-0/+47
* | | | Add a way to set QHeaderView initial sort orderAlbert Astals Cid2010-11-251-3/+11
|/ / /
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-122-5/+5
|\ \ \ | |/ /
| * | Doc: Fixing typoSergio Ahumada2010-11-092-5/+5
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-041-19/+0
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-271-1/+1
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-251-0/+13
| |\ \ \
| * | | | Doc: Moved QFileSystemModel example code to the class documentation.David Boddie2010-10-211-19/+0
* | | | | Fix QAbstractProxyModel::mimeData to use list of mapped indexesPavel Lebedev2010-10-271-1/+1
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-251-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-211-0/+13
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Doc: Fixed documentation style and qdoc warnings.David Boddie2010-10-081-1/+1
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| | |/ / | |/| |
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-251-0/+13
|\ \ \ \
| * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-0/+13
| |\ \ \ \ | | |/ / /
| | * | | Make sure d->ranges does not have invalid ranges before processing it.Stephen Kelly2010-10-211-0/+13
| | |/ /
* | | | Fixed a possible crash when resizing QListViewThierry Bastian2010-10-251-3/+4
|/ / /
* | | Fix compilation with QT_NO_KEYWORDSOlivier Goffart2010-10-211-1/+1
* | | Moving the resetInternalData slot to QAbstractProxyModelGabriel de Dietrich2010-10-192-1/+26