Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 2 | -27/+39 |
|\ | |||||
| * | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer... | David Boddie | 2011-02-23 | 1 | -33/+19 |
| |\ | |||||
| * | | Doc: Fixed qdoc warnings. | David Boddie | 2011-02-23 | 1 | -14/+34 |
| * | | Merge branch 'mimir' into 4.7 | David Boddie | 2011-02-23 | 1 | -13/+5 |
| |\ \ | |||||
| | * | | qdoc: Added the \caption command. | Martin Smith | 2011-01-13 | 1 | -13/+5 |
| | * | | Merge branch '4.7' into mimir | David Boddie | 2010-12-15 | 2 | -1/+9 |
| | |\ \ | |||||
| * | \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-02-04 | 2 | -5/+9 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'master-upstream' | Thierry Bastian | 2011-03-10 | 2 | -4/+3 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-03-04 | 1 | -1/+0 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master | axis | 2011-02-24 | 3 | -42/+32 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Remove useless processEvent | Olivier Goffart | 2011-02-17 | 1 | -1/+0 |
| * | | | | | | | | Various INTEGRITY fixes | Rolland Dudemaine | 2011-02-22 | 1 | -3/+3 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'master-upstream' | Gabriel de Dietrich | 2011-02-15 | 3 | -42/+32 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-02-11 | 1 | -33/+19 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-02-10 | 1 | -33/+19 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Fix QFileDialog Symbian native file dialog filename filtering. | Miikka Heikkinen | 2011-02-10 | 1 | -33/+19 |
| | | | |_|/ / / | | | |/| | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-02-04 | 1 | -4/+4 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Merge branch '4.7' of ../qt into 4.7 | David Boddie | 2011-01-13 | 63 | -100/+134 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-16 | 2 | -7/+8 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-12-15 | 2 | -1/+9 |
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | / | | | | | |_|_|/ | | | | |/| | | | |||||
| | | * | | | | | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-07 | 12 | -81/+473 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | doc: Corrections to linking errors in the docs. | Martin Smith | 2010-11-01 | 1 | -4/+4 |
| * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-04 | 2 | -5/+9 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Fix few QFileDialog static method issues in Symbian^3 | Miikka Heikkinen | 2011-02-02 | 2 | -5/+9 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2011-01-20 | 63 | -66/+75 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 63 | -64/+73 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 63 | -64/+64 |
| | * | | | | | Fix crash when closing QFontDialog::getFont() dialog | Gabriel de Dietrich | 2011-01-03 | 1 | -0/+9 |
| * | | | | | | fix 'QChar::QChar(char)' is deprecated | Konstantin Ritt | 2011-01-11 | 1 | -1/+1 |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-12-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-12-24 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | QMessageBox wrong Show/Hide Details button label | Raul Metsma | 2010-12-21 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-25 | 1 | -6/+18 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-12-24 | 1 | -6/+18 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Fix fullscreen/Maximized dialog misplacement in Symbian | Miikka Heikkinen | 2010-12-23 | 1 | -6/+18 |
* | | | | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-24 | 1 | -30/+43 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-23 | 1 | -30/+43 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Remove few compile warnings | Miikka Heikkinen | 2010-12-20 | 1 | -2/+2 |
| | * | | | | | Fix using QFileDialog statics in Symbian. | Miikka Heikkinen | 2010-12-20 | 1 | -28/+41 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Fixed a double selection in QFileDialog when saving | Thierry Bastian | 2010-12-22 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-20 | 3 | -7/+16 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-12-14 | 1 | -0/+8 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int... | Qt Continuous Integration System | 2010-12-14 | 1 | -0/+8 |
| | |\ \ \ | |||||
| | | * | | | Cocoa: cannot use staysOnTop flag for native file dialogs | Richard Moe Gustavsen | 2010-12-13 | 1 | -0/+8 |
| | | | |/ | | | |/| | |||||
| * | | | | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-12-10 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Corrected case on Symbian library. | axis | 2010-12-10 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | QLabel wraps text at fixed lengths | Sami Merila | 2010-12-09 | 2 | -7/+8 |
| |/ / | |||||
* | | | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil... | Qt Continuous Integration System | 2010-12-14 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil... | Qt Continuous Integration System | 2010-12-07 | 1 | -1/+1 |
| |\ \ \ |