| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-06 | 11 | -49/+82 |
|\ |
|
| * | Improvement of de30288: handle PNGs having 1 to 4 bytes truncated. | aavit | 2010-12-01 | 1 | -1/+2 |
|
|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | aavit | 2010-12-01 | 36 | -304/+802 |
| |\ |
|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Joona Petrell | 2010-11-30 | 8 | -11/+24 |
| | |\ |
|
| | | * | Removed some new warnigs. | Alessandro Portale | 2010-11-29 | 1 | -3/+2 |
|
|
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-11-27 | 5 | -5/+19 |
| | | |\ |
|
| | | | * | Fix strict-aliasing violation warning. | Thiago Macieira | 2010-11-26 | 1 | -1/+9 |
|
|
| | | | * | Fix warnings related to unused variables. | Thiago Macieira | 2010-11-26 | 2 | -0/+6 |
|
|
| | | | * | Fix warning about mixing integral with non-integral type in ?: | Thiago Macieira | 2010-11-26 | 1 | -2/+2 |
|
|
| | | | * | Fix warnings with GCC 4.5: some cases are not part of the enum | Thiago Macieira | 2010-11-26 | 1 | -2/+2 |
|
|
| | | * | | 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 |
|
|
| | * | | | Fix resource leak in QEgl::getCompatibleVisualld() | Rhys Weatherley | 2010-11-29 | 1 | -1/+3 |
|
|
| | * | | | Fixed OpenGL state getting out of sync. | Samuel Rødal | 2010-11-26 | 2 | -0/+12 |
| | |/ / |
|
| | * | | Fix possible artifacts under glyphs in texture glyph cache | Eskil Abrahamsen Blomfeldt | 2010-11-25 | 1 | -1/+1 |
|
|
| * | | | Workaround for certain malformed PNGs that lack the final crc bytes | aavit | 2010-12-01 | 1 | -34/+46 |
|
|
* | | | | 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 '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 |
|
|
* | | | | | | | QGtkStyle: Don't create new GtkAdjustment objects on every draw | Andreas Kling | 2010-12-01 | 3 | -15/+51 |
|
|
* | | | | | | | QRasterPixmapData: Reuse underlying QImage in fill() if possible. | Andreas Kling | 2010-11-30 | 3 | -40/+46 |
| |_|/ / / /
|/| | | | | |
|
* | | | | | | 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' 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 |
|
|