Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-14 | 2 | -4/+14 |
|\ | |||||
| * | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-14 | 2 | -4/+14 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-14 | 1 | -2/+5 |
| | |\ | |||||
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7 | Sami Merila | 2011-03-14 | 4 | -7/+40 |
| | | |\ | |||||
| | | * | | QS60Style: QTreeView::indexRowSizeHint returns incorrect value | Sami Merila | 2011-03-14 | 1 | -2/+5 |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-14 | 1 | -2/+9 |
| | |\ \ \ | |||||
| | | * | | | Fix TextEdit mouseSelectionMode overriding selectByMouse. | Andrew den Exter | 2011-03-14 | 1 | -2/+9 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast... | Qt Continuous Integration System | 2011-03-14 | 14 | -55/+187 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master-upstream' | Thierry Bastian | 2011-03-10 | 77 | -207/+2871 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Merge request: 1111 | Richard Moe Gustavsen | 2011-02-25 | 1 | -0/+7 |
| * | | | | | | | Mac: add support for closing dialogs using Cmd-D | Richard Moe Gustavsen | 2011-02-21 | 1 | -0/+8 |
| * | | | | | | | Cocoa: use mouse location from event | Richard Moe Gustavsen | 2011-02-18 | 2 | -3/+3 |
| * | | | | | | | Cocoa: implement eventdispatcher flag excludeUserInputEvents | Richard Moe Gustavsen | 2011-02-18 | 1 | -18/+42 |
| * | | | | | | | Cocoa: processEvents does not always send posted events | Richard Moe Gustavsen | 2011-02-17 | 1 | -2/+8 |
| * | | | | | | | Merge branch 'master-upstream' | Gabriel de Dietrich | 2011-02-15 | 33 | -228/+320 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Added QMdiArea::tabsMovable and tabsClosable | J-P Nurmi | 2011-02-10 | 3 | -1/+94 |
| * | | | | | | | | Merge branch 'master-upstream' | Gabriel de Dietrich | 2011-02-08 | 78 | -1766/+3195 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2011-01-20 | 1148 | -1393/+1518 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Enable the widthForHeight() test case. | Jan-Arve Saether | 2011-01-19 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-25 | 2 | -28/+33 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-24 | 6 | -69/+203 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fixed a double selection in QFileDialog when saving | Thierry Bastian | 2010-12-22 | 1 | -0/+1 |
| * | | | | | | | | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-22 | 27 | -731/+452 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-21 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-16 | 6 | -48/+50 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-15 | 23 | -206/+315 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-14 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-11 | 13 | -55/+91 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-10 | 2 | -6/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-09 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | 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-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-07 | 3 | -15/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-05 | 18 | -1/+4307 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-03 | 34 | -1012/+1779 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-02 | 3 | -15/+51 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a problem with toolbars not relayouting | Thierry Bastian | 2010-12-01 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-01 | 3 | -40/+46 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-11-27 | 6 | -2/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-11-26 | 52 | -345/+833 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a way to set QHeaderView initial sort order | Albert Astals Cid | 2010-11-25 | 1 | -3/+11 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Fixing typo | Sergio Ahumada | 2010-11-25 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-11-23 | 1 | -1/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-03-14 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix combining marks handling in Core Text shaper | Jiang Jiang | 2011-03-11 | 1 | -1/+2 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 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/master' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 66 | -73/+84 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |