summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-0611-49/+82
|\
| * Improvement of de30288: handle PNGs having 1 to 4 bytes truncated.aavit2010-12-011-1/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-12-0136-304/+802
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Joona Petrell2010-11-308-11/+24
| | |\
| | | * Removed some new warnigs.Alessandro Portale2010-11-291-3/+2
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-275-5/+19
| | | |\
| | | | * Fix strict-aliasing violation warning.Thiago Macieira2010-11-261-1/+9
| | | | * Fix warnings related to unused variables.Thiago Macieira2010-11-262-0/+6
| | | | * Fix warning about mixing integral with non-integral type in ?:Thiago Macieira2010-11-261-2/+2
| | | | * Fix warnings with GCC 4.5: some cases are not part of the enumThiago Macieira2010-11-261-2/+2
| | | * | Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-11-262-3/+3
| | | |\ \ | | | | |/ | | | |/|
| | | | * Doc: fix typoJoerg Bornemann2010-11-262-3/+3
| | * | | Fix resource leak in QEgl::getCompatibleVisualld()Rhys Weatherley2010-11-291-1/+3
| | * | | Fixed OpenGL state getting out of sync.Samuel Rødal2010-11-262-0/+12
| | |/ /
| | * | Fix possible artifacts under glyphs in texture glyph cacheEskil Abrahamsen Blomfeldt2010-11-251-1/+1
| * | | Workaround for certain malformed PNGs that lack the final crc bytesaavit2010-12-011-34/+46
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-12-0218-1/+4307
|\ \ \ \
| * | | | Simple fixes for CI gateRobert Griebl2010-12-023-4/+4
| * | | | Fix compile on QWSRobert Griebl2010-12-021-1/+1
| * | | | Fix code style issues in QScrollerRobert Griebl2010-12-023-8/+8
| * | | | QScroller merge, part 1Robert Griebl2010-12-0218-1/+4307
* | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2010-12-0234-1012/+1779
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Restore patch that got lost in mergeJørgen Lind2010-12-022-3/+66
| * | | | Fix spelling in commentJørgen Lind2010-12-021-1/+1
| * | | | Spelling mistakes in Documentation. There are probably more :)Jørgen Lind2010-12-013-10/+10
| * | | | Restore patch that disappeared in mergeJørgen Lind2010-12-012-3/+3
| * | | | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-2959-356/+877
| |\ \ \ \
| * | | | | Make QtOpenGL use shared contextexts on LighthouseJørgen Lind2010-11-262-12/+18
| * | | | | Lighthouse: Fix QGLContext::currentContext for systems with limitedJørgen Lind2010-11-242-17/+5
| * | | | | Adding some documentation for LighthouseJørgen Lind2010-11-2210-10/+393
| * | | | | Lighthouse: move the currentContext functionality to QPlatformGLContextJørgen Lind2010-11-223-8/+143
| * | | | | Remove QWidget::paintEngine() codepath for LighthouseJørgen Lind2010-11-221-0/+4
| * | | | | Fix transformIsSimple in QGraphicsSceneJørgen Lind2010-11-221-18/+1
| * | | | | Lighthouse: Make sure that we call QPlatformWindow::setVisibleJørgen Lind2010-11-221-19/+16
| * | | | | Lighthouse: using QFont enums when possible in QPlatformFontdatabaseJørgen Lind2010-11-223-15/+12
| * | | | | No more windowsurface for QGLWidget in LighthouseJørgen Lind2010-11-223-28/+34
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-11-1987-395/+1017
| |\ \ \ \ \
| * | | | | | Compile fix for c1148ee9a60a6fae8.Paul Olav Tvete2010-10-291-2/+0
| * | | | | | Moving QCoreTextFontEngine with related classes into own fileJørgen Lind2010-10-2814-888/+1014
| * | | | | | Lighthouse: eventloop integration rework.Jørgen Lind2010-10-283-8/+106
* | | | | | | QGtkStyle: Don't create new GtkAdjustment objects on every drawAndreas Kling2010-12-013-15/+51
* | | | | | | QRasterPixmapData: Reuse underlying QImage in fill() if possible.Andreas Kling2010-11-303-40/+46
| |_|/ / / / |/| | | | |
* | | | | | Corrected case on Symbian library.axis2010-11-261-1/+1
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-255-1/+11
|\ \ \ \ \ \
| * | | | | | Fix some memory leaks.Fabien Freling2010-11-255-1/+11
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-252-1/+16
|\ \ \ \ \ \ \
| * | | | | | | Allow QDial to wrap value when wrapping property is set.Andy Nichols2010-11-252-1/+16
| |/ / / / / /
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-2535-303/+769
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-251-1/+1
| |\ \ \ \ \
| | * | | | | fix inf loop bughawcroft2010-11-251-1/+1