summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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-0520-1/+4312
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-12-0320-1/+4312
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-12-0220-1/+4312
| | |\
| | | * 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-0220-1/+4312
* | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-041-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-12-031-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Changed various DEPLOYMENT variable ".sources" suffixes to ".files"Miikka Heikkinen2010-12-021-1/+1
| | |/
* | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-0359-1186/+2141
|\ \ \ | |/ /
| * | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2010-12-0259-1186/+2141
| |\ \ | | |/ | |/|
| | * 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
| | * Fix spelling mistake in QEGLPlatformcontextJørgen Lind2010-12-014-4/+4
| | * Restore patch that disappeared in mergeJørgen Lind2010-12-012-3/+3
| | * Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-3010-34/+513
| | |\
| | * \ Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-29153-890/+1689
| | |\ \
| | * | | Make the openKODE use the new eventloopintegration api.Jørgen Lind2010-11-264-14/+24
| | * | | Make QtOpenGL use shared contextexts on LighthouseJørgen Lind2010-11-269-49/+110
| | * | | Move the Lighthouse specfic api into qpa_qpa.cppJørgen Lind2010-11-263-12/+22
| | * | | Lighthouse: Fix QGLContext::currentContext for systems with limitedJørgen Lind2010-11-2413-68/+141
| | * | | Make EglFS plugin compile after changes to QPlatformEGLContextGunnar Sletta2010-11-231-1/+1
| | * | | Adding some documentation for LighthouseJørgen Lind2010-11-2210-10/+393
| | * | | Lighthouse: move the currentContext functionality to QPlatformGLContextJørgen Lind2010-11-2211-26/+205
| | * | | 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-222-20/+16
| | * | | Lighthouse: using QFont enums when possible in QPlatformFontdatabaseJørgen Lind2010-11-225-22/+25
| | * | | No more windowsurface for QGLWidget in LighthouseJørgen Lind2010-11-224-28/+35
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-lighthouseGunnar Sletta2010-11-191-0/+9
| | |\ \ \
| | | * | | Add workaround_brokenFBOReadback=true for maliGunnar Sletta2010-11-191-0/+9
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-11-19299-1598/+3774
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | 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-287-91/+158
* | | | | | 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-0111-66/+536
|\ \ \ \ \ \ | |/ / / / /
| * | | | | avoid the warning about comparison between signed and unsigned integersKonstantin Ritt2010-11-301-1/+1
| * | | | | QRasterPixmapData: Reuse underlying QImage in fill() if possible.Andreas Kling2010-11-303-40/+46
| | |_|_|/ | |/| | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-11-307-25/+489
| |\ \ \ \
| | * | | | DEF file freezemread2010-11-297-25/+489
| | | |_|/ | | |/| |
* | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-303-9/+24
|\ \ \ \ \ | |/ / / /
| * | | | minor optimization: decrease amount of possible detaches to 1Konstantin Ritt2010-11-291-6/+10
| * | | | add reminders for Qt 5.0Konstantin Ritt2010-11-291-3/+3