Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-05 | 18 | -1/+4307 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-12-02 | 18 | -1/+4307 |
| |\ | |||||
| | * | Simple fixes for CI gate | Robert Griebl | 2010-12-02 | 3 | -4/+4 |
| | * | Fix compile on QWS | Robert Griebl | 2010-12-02 | 1 | -1/+1 |
| | * | Fix code style issues in QScroller | Robert Griebl | 2010-12-02 | 3 | -8/+8 |
| | * | QScroller merge, part 1 | Robert Griebl | 2010-12-02 | 18 | -1/+4307 |
* | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-03 | 34 | -1012/+1779 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into... | Qt Continuous Integration System | 2010-12-02 | 34 | -1012/+1779 |
| |\ \ | | |/ | |/| | |||||
| | * | Restore patch that got lost in merge | Jørgen Lind | 2010-12-02 | 2 | -3/+66 |
| | * | Fix spelling in comment | Jørgen Lind | 2010-12-02 | 1 | -1/+1 |
| | * | Spelling mistakes in Documentation. There are probably more :) | Jørgen Lind | 2010-12-01 | 3 | -10/+10 |
| | * | Restore patch that disappeared in merge | Jørgen Lind | 2010-12-01 | 2 | -3/+3 |
| | * | Merge remote branch 'origin/master' into lighthouse-master | Jørgen Lind | 2010-11-29 | 59 | -356/+877 |
| | |\ | |||||
| | * | | Make QtOpenGL use shared contextexts on Lighthouse | Jørgen Lind | 2010-11-26 | 2 | -12/+18 |
| | * | | Lighthouse: Fix QGLContext::currentContext for systems with limited | Jørgen Lind | 2010-11-24 | 2 | -17/+5 |
| | * | | Adding some documentation for Lighthouse | Jørgen Lind | 2010-11-22 | 10 | -10/+393 |
| | * | | Lighthouse: move the currentContext functionality to QPlatformGLContext | Jørgen Lind | 2010-11-22 | 3 | -8/+143 |
| | * | | Remove QWidget::paintEngine() codepath for Lighthouse | Jørgen Lind | 2010-11-22 | 1 | -0/+4 |
| | * | | Fix transformIsSimple in QGraphicsScene | Jørgen Lind | 2010-11-22 | 1 | -18/+1 |
| | * | | Lighthouse: Make sure that we call QPlatformWindow::setVisible | Jørgen Lind | 2010-11-22 | 1 | -19/+16 |
| | * | | Lighthouse: using QFont enums when possible in QPlatformFontdatabase | Jørgen Lind | 2010-11-22 | 3 | -15/+12 |
| | * | | No more windowsurface for QGLWidget in Lighthouse | Jørgen Lind | 2010-11-22 | 3 | -28/+34 |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Gunnar Sletta | 2010-11-19 | 87 | -395/+1017 |
| | |\ \ | |||||
| | * | | | Compile fix for c1148ee9a60a6fae8. | Paul Olav Tvete | 2010-10-29 | 1 | -2/+0 |
| | * | | | Moving QCoreTextFontEngine with related classes into own file | Jørgen Lind | 2010-10-28 | 14 | -888/+1014 |
| | * | | | Lighthouse: eventloop integration rework. | Jørgen Lind | 2010-10-28 | 3 | -8/+106 |
* | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-02 | 3 | -15/+51 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | QGtkStyle: Don't create new GtkAdjustment objects on every draw | Andreas Kling | 2010-12-01 | 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 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | QRasterPixmapData: Reuse underlying QImage in fill() if possible. | Andreas Kling | 2010-11-30 | 3 | -40/+46 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-11-27 | 6 | -2/+12 |
|\ \ \ \ | |/ / / | |||||
| * | | | Corrected case on Symbian library. | axis | 2010-11-26 | 1 | -1/+1 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-11-25 | 5 | -1/+11 |
| |\ \ \ | |||||
| | * | | | Fix some memory leaks. | Fabien Freling | 2010-11-25 | 5 | -1/+11 |
* | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-11-26 | 52 | -345/+833 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-25 | 2 | -1/+16 |
| |\ \ \ \ | |||||
| | * | | | | Allow QDial to wrap value when wrapping property is set. | Andy Nichols | 2010-11-25 | 2 | -1/+16 |
| | |/ / / | |||||
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-25 | 35 | -303/+769 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-11-25 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | fix inf loop bug | hawcroft | 2010-11-25 | 1 | -1/+1 |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-24 | 13 | -119/+511 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Fix spaces | Janne Koskinen | 2010-11-23 | 2 | -2/+2 |
| | | * | | | Native color dialog on symbian | Milla Pohjanheimo | 2010-11-23 | 3 | -6/+131 |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-19 | 11 | -119/+386 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7 | Janne Koskinen | 2010-11-19 | 1 | -1/+1 |
| | | | |\ \ \ | |||||
| | | | | * | | | Add symbian scope for qfiledialog_symbian.cpp | Miikka Heikkinen | 2010-11-18 | 1 | -1/+1 |
| | | | * | | | | Corrected ASCII comparison and removed extra braces | Titta Heikkala | 2010-11-19 | 2 | -20/+15 |
| | | | |/ / / | |||||
| | | | * | | | Removed extra cpp and done changes based on comments | Titta Heikkala | 2010-11-18 | 3 | -20/+14 |
| | | | * | | | Correct flags for Symbian file dialogs | Titta Heikkala | 2010-11-18 | 1 | -1/+1 |