Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-05-24 | 68 | -1210/+1156 |
|\ | |||||
| * | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-18 | 3 | -54/+0 |
| |\ | |||||
| | * | Revert all QScroller and QFlickGesture related code. | Robert Griebl | 2011-05-16 | 3 | -54/+0 |
| * | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 68 | -1156/+1156 |
| |/ | |||||
* | | Doc: Fixed qdoc warnings. | David Boddie | 2011-05-11 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-05-03 | 1 | -1/+1 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-03 | 1 | -1/+1 |
| |\ | |||||
| | * | Doc: Fixed reference to a name in a table. | David Boddie | 2011-04-11 | 1 | -1/+1 |
* | | | Merge earth-team into origin/4.8 | Olivier Goffart | 2011-05-03 | 9 | -33/+734 |
|\ \ \ | |/ / | |||||
| * | | Removing the "resetInternalData" slot in QAbstractProxyModel | Gabriel de Dietrich | 2011-04-26 | 2 | -26/+1 |
| * | | Merge branch 'master-upstream' | Thierry Bastian | 2011-04-19 | 4 | -5/+21 |
| |\ \ | |||||
| * | | | Fix licence headers again for MR 900 | Sergio Ahumada | 2011-04-14 | 2 | -9/+18 |
| * | | | Fix licence headers again for MR 900 | Gabriel de Dietrich | 2011-04-14 | 2 | -20/+21 |
| * | | | Add the QIdentityProxyModel. | Stephen Kelly | 2011-04-12 | 4 | -1/+700 |
| * | | | QTableView: prevent QTableView from hanging when removing rows. | Pierre Rossi | 2011-04-04 | 2 | -1/+21 |
| * | | | Merge branch 'master-upstream' | Thierry Bastian | 2011-03-24 | 2 | -0/+7 |
| |\ \ \ | |||||
| * | | | | Use the virtual API to clear a selection. | Stephen Kelly | 2011-03-15 | 1 | -5/+2 |
* | | | | | Fixes warnings about unused variables | Olivier Goffart | 2011-04-28 | 1 | -1/+0 |
| |_|/ / |/| | | | |||||
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-07 | 1 | -0/+5 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Doc: Update to QStyledItemDelegate::displayText() | Geir Vattekar | 2011-03-25 | 1 | -0/+5 |
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 3 | -5/+16 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into mer... | David Boddie | 2011-02-28 | 2 | -7/+9 |
| |\ \ | |||||
| * \ \ | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer... | David Boddie | 2011-02-23 | 1 | -5/+6 |
| |\ \ \ | |||||
| * | | | | Doc: itemAt for QTreeWidget/QListWidget are relative to the viewport | Geir Vattekar | 2011-02-17 | 2 | -3/+10 |
| * | | | | Doc: Work on QHeaderView::sectionPosition() | Geir Vattekar | 2011-02-17 | 1 | -2/+6 |
* | | | | | Fix compilation with QT_NO_ | Tasuku Suzuki | 2011-03-21 | 2 | -0/+7 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'master-upstream' | Thierry Bastian | 2011-03-10 | 3 | -12/+15 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-01 | 2 | -7/+9 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-02-25 | 2 | -7/+9 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | QSortFilterProxyModel::reset() should invalidate. | Olivier Goffart | 2011-02-25 | 2 | -7/+9 |
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-23 | 1 | -5/+6 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix crash in KPackageKit | Gabriel de Dietrich | 2011-02-15 | 1 | -5/+6 |
| | | |/ | | |/| | |||||
* | | | | Merge branch 'master-upstream' | Gabriel de Dietrich | 2011-02-15 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Doc: Fixed confusing wording of a sentence. | David Boddie | 2011-01-27 | 1 | -2/+2 |
| | |/ | |||||
* | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2011-01-20 | 66 | -68/+75 |
|\ \ \ | |/ / | |||||
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 66 | -68/+75 |
| |\ \ | | |/ | |||||
| | * | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 66 | -66/+66 |
| | * | Fix timer warning when deleting item views | Gabriel de Dietrich | 2010-12-21 | 1 | -2/+9 |
* | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-22 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-20 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | Suppress a warning about killing a timer that isn't active. | Thiago Macieira | 2010-12-15 | 1 | -0/+2 |
* | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-15 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Olivier Goffart | 2010-12-13 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-13 | 1 | -2/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-11-27 | 2 | -3/+3 |
| | |\ \ | |||||
| | * | | | Fix filtering of columns in QSFPM. | Stephen Kelly | 2010-11-23 | 1 | -2/+2 |
* | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-14 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-12-11 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | We should not cache ICO files. | Alexis Menard | 2010-12-10 | 1 | -1/+1 |