Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-11 | 2 | -3/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-06 | 2 | -3/+3 |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | |||||
| | * | | Merge branch 4.6 into qt-4.7-from-4.6 | Qt Continuous Integration System | 2010-11-26 | 2 | -3/+3 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Doc: fix typo | Joerg Bornemann | 2010-11-26 | 2 | -3/+3 |
* | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-05 | 3 | -0/+47 |
|\ \ \ \ | |/ / / | |||||
| * | | | QScroller merge, part 1 | Robert Griebl | 2010-12-02 | 3 | -0/+47 |
* | | | | Add a way to set QHeaderView initial sort order | Albert Astals Cid | 2010-11-25 | 1 | -3/+11 |
|/ / / | |||||
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-12 | 2 | -5/+5 |
|\ \ \ | |/ / | |||||
| * | | Doc: Fixing typo | Sergio Ahumada | 2010-11-09 | 2 | -5/+5 |
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-11-04 | 1 | -19/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-27 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-25 | 1 | -0/+13 |
| |\ \ \ | |||||
| * | | | | Doc: Moved QFileSystemModel example code to the class documentation. | David Boddie | 2010-10-21 | 1 | -19/+0 |
* | | | | | Fix QAbstractProxyModel::mimeData to use list of mapped indexes | Pavel Lebedev | 2010-10-27 | 1 | -1/+1 |
* | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-25 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration | Qt Continuous Integration System | 2010-10-25 | 1 | -1/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-21 | 1 | -0/+13 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Doc: Fixed documentation style and qdoc warnings. | David Boddie | 2010-10-08 | 1 | -1/+1 |
* | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-25 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed many spelling errors. | Rohan McGovern | 2010-10-25 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-10-25 | 1 | -0/+13 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-25 | 1 | -0/+13 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Make sure d->ranges does not have invalid ranges before processing it. | Stephen Kelly | 2010-10-21 | 1 | -0/+13 |
| | |/ / | |||||
* | | | | Fixed a possible crash when resizing QListView | Thierry Bastian | 2010-10-25 | 1 | -3/+4 |
|/ / / | |||||
* | | | Fix compilation with QT_NO_KEYWORDS | Olivier Goffart | 2010-10-21 | 1 | -1/+1 |
* | | | Moving the resetInternalData slot to QAbstractProxyModel | Gabriel de Dietrich | 2010-10-19 | 2 | -1/+26 |