summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2468-1210/+1156
|\
| * Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-183-54/+0
| |\
| | * Revert all QScroller and QFlickGesture related code.Robert Griebl2011-05-163-54/+0
| * | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1368-1156/+1156
| |/
* | Doc: Fixed qdoc warnings.David Boddie2011-05-111-1/+1
|/
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-031-1/+1
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-031-1/+1
| |\
| | * Doc: Fixed reference to a name in a table.David Boddie2011-04-111-1/+1
* | | Merge earth-team into origin/4.8Olivier Goffart2011-05-039-33/+734
|\ \ \ | |/ /
| * | Removing the "resetInternalData" slot in QAbstractProxyModelGabriel de Dietrich2011-04-262-26/+1
| * | Merge branch 'master-upstream'Thierry Bastian2011-04-194-5/+21
| |\ \
| * | | Fix licence headers again for MR 900Sergio Ahumada2011-04-142-9/+18
| * | | Fix licence headers again for MR 900Gabriel de Dietrich2011-04-142-20/+21
| * | | Add the QIdentityProxyModel.Stephen Kelly2011-04-124-1/+700
| * | | QTableView: prevent QTableView from hanging when removing rows.Pierre Rossi2011-04-042-1/+21
| * | | Merge branch 'master-upstream'Thierry Bastian2011-03-242-0/+7
| |\ \ \
| * | | | Use the virtual API to clear a selection.Stephen Kelly2011-03-151-5/+2
* | | | | Fixes warnings about unused variablesOlivier Goffart2011-04-281-1/+0
| |_|/ / |/| | |
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-0/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Doc: Update to QStyledItemDelegate::displayText()Geir Vattekar2011-03-251-0/+5
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-313-5/+16
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-282-7/+9
| |\ \
| * \ \ Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-231-5/+6
| |\ \ \
| * | | | Doc: itemAt for QTreeWidget/QListWidget are relative to the viewportGeir Vattekar2011-02-172-3/+10
| * | | | Doc: Work on QHeaderView::sectionPosition()Geir Vattekar2011-02-171-2/+6
* | | | | Fix compilation with QT_NO_Tasuku Suzuki2011-03-212-0/+7
| |_|_|/ |/| | |
* | | | 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