summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Cleanup unused QAccessWidgetminiak2010-12-081-17/+4
* Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-081-1/+1
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-061-1/+1
| |\
| | * Revert "QSystemTrayIcon::messageTimeout() signal implemented"Paul Olav Tvete2010-12-063-18/+1
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-044-2/+19
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-024-2/+19
| | | |\
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-014-2/+19
| | | | |\
| | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-014-2/+19
| | | | | |\
| | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-11-2947-309/+838
| | | | | | |\
| | | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-263-1/+18
| | | | | | | |\
| | | | | | | | * QSystemTrayIcon::messageTimeout() signal implementedminiak2010-11-263-1/+18
| | | | | | * | | compile with debug defined enabledGunnar Sletta2010-11-241-1/+1
* | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-073-15/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | QGtkStyle: Use gtk_progress_configure() instead of adjustment APIAndreas Kling2010-12-063-15/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-0518-1/+4307
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 'master-upstream' into master-waterThierry Bastian2010-12-0334-1012/+1779
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-023-15/+51
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | QGtkStyle: Don't create new GtkAdjustment objects on every drawAndreas Kling2010-12-013-15/+51
| | |_|_|/ / / | |/| | | | |
* | | | | | | Fixed a problem with toolbars not relayoutingThierry Bastian2010-12-011-4/+4
* | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-013-40/+46
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | QRasterPixmapData: Reuse underlying QImage in fill() if possible.Andreas Kling2010-11-303-40/+46
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-276-2/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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-upstream' into master-waterThierry Bastian2010-11-2652-345/+833
|\ \ \ \ \ \ | |/ / / / /