Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mainline/master' | Oswald Buddenhagen | 2011-03-22 | 2 | -4/+15 |
|\ | |||||
| * | Merge remote branch 'qt/master' into staging-master | Samuel Rødal | 2011-03-21 | 1 | -2/+2 |
| |\ | |||||
| * \ | Merge remote branch 'mainline/master' into merge_raster | Fabien Freling | 2011-03-15 | 10 | -31/+127 |
| |\ \ | |||||
| * | | | Add the ability to remove a toolbar from the unified toolbar. | Fabien Freling | 2011-02-25 | 1 | -3/+3 |
| * | | | Merge remote branch 'mainline/master' into merge_raster | Fabien Freling | 2011-02-23 | 156 | -203/+230 |
| |\ \ \ | |||||
| * | | | | Free memory when disabling the unified toolbar. | Fabien Freling | 2011-01-14 | 1 | -1/+12 |
* | | | | | Fix compilation with QT_NO_ | Tasuku Suzuki | 2011-03-21 | 4 | -2/+10 |
| |_|_|/ |/| | | | |||||
* | | | | Merge earth-team into master | Olivier Goffart | 2011-03-15 | 1 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Do not handle posted events in QSplashScreen. | Denis Dzyubenko | 2011-03-03 | 1 | -2/+2 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast... | Qt Continuous Integration System | 2011-03-14 | 6 | -27/+113 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master-upstream' | Thierry Bastian | 2011-03-10 | 4 | -3/+9 |
| |\ \ \ \ | |||||
| * | | | | | Mac: add support for closing dialogs using Cmd-D | Richard Moe Gustavsen | 2011-02-21 | 1 | -0/+8 |
| * | | | | | Merge branch 'master-upstream' | Gabriel de Dietrich | 2011-02-15 | 2 | -22/+24 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Added QMdiArea::tabsMovable and tabsClosable | J-P Nurmi | 2011-02-10 | 3 | -1/+94 |
| * | | | | | Merge branch 'master-upstream' | Gabriel de Dietrich | 2011-02-08 | 6 | -15/+40 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2011-01-20 | 156 | -166/+166 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-24 | 1 | -5/+12 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-21 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-15 | 4 | -1/+16 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fix qFadeEffect windowOpacity issue on Windows | miniak | 2010-12-08 | 1 | -5/+3 |
| * | | | | | | | | | | Cleanup unused QAccessWidget | miniak | 2010-12-08 | 1 | -17/+4 |
| * | | | | | | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-05 | 2 | -1/+106 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fixed a problem with toolbars not relayouting | Thierry Bastian | 2010-12-01 | 1 | -4/+4 |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode. | Andrew den Exter | 2011-03-11 | 1 | -1/+5 |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Position the TextInput cursor correctly after IM text is commited. | Andrew den Exter | 2011-03-03 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-02-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Fix QPlainTextEdit corruption/crash with scrolling | mae | 2011-02-23 | 1 | -1/+1 |
* | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-23 | 2 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-18 | 2 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Update the input context when the pre-edit cursor position changes. | Andrew den Exter | 2011-02-16 | 2 | -0/+4 |
* | | | | | | | | | | | | Merge branch earth-team/master into earth-staging | João Abecasis | 2011-02-16 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed resizing popups with QSizeGrip on X11 | Denis Dzyubenko | 2011-02-10 | 1 | -1/+3 |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 1 | -20/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 | -20/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2011-01-28 | 1 | -4/+12 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of ../qt into 4.7 | David Boddie | 2011-01-13 | 156 | -166/+166 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-12-15 | 5 | -2/+17 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-14 | 1 | -5/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-07 | 7 | -26/+36 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' into mimir | Morten Engvoldsen | 2010-10-09 | 1 | -11/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'origin/4.7' into mimir | Morten Engvoldsen | 2010-10-06 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimir | Martin Smith | 2010-09-30 | 3 | -11/+24 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | qdoc: Added missing </section>; added "span" infor temporarily. | Martin Smith | 2010-09-30 | 1 | -20/+19 |
* | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-04 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Bea Lam | 2011-01-27 | 1 | -4/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-19 | 156 | -166/+166 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Don't crash if cursor at the end. | Alan Alpert | 2011-01-11 | 1 | -1/+4 |