summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-053-2/+35
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-043-2/+35
| |\
| | * Added environment variable for style overriding.Dominik Holland2010-11-021-2/+10
| | * Cleanup Meego Compositor detectionHarald Fernengel2010-11-022-28/+18
| | * Added Maemo 6 to the X11 desktopEnvironment listDominik Holland2010-11-022-0/+35
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-041-4/+6
|\ \ \ | |/ /
| * | The lastCenterPoint should be equal to centerPoint for new gestures.Frederik Gladhorn2010-11-031-3/+5
| * | PinchGesture: lastRotationAngle should start at 0.Frederik Gladhorn2010-11-031-1/+1
| |/
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-032-0/+9
|\ \
| * | Add member-swap to shared datatypes that don't have it.Marc Mutz2010-11-032-0/+9
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-021-1/+1
|\ \ \ | |/ / |/| / | |/
| * Fix a few typos in comments and docs.Jason McDonald2010-11-011-1/+1
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-304-10/+23
|\ \ | |/
| * Avoid being killed by graphics out-of-memory monitor.Jason Barron2010-10-291-0/+11
| * Do not crash on SymbianAlessandro Portale2010-10-282-3/+9
| * Fixed crash with QClipboard in Symbian^3Titta Heikkala2010-10-281-7/+3
* | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2010-10-2947-32/+7235
|\ \
| * | Fix the license in files for LighthouseJørgen Lind2010-10-282-0/+82
| * | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2617-63/+247
| |\ \
| * \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2220-58/+142
| |\ \ \
| * \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-10-221-1/+1
| |\ \ \ \
| | * | | | Lighthouse on OS X.Morten Johan Sørvig2010-10-201-1/+1
| | * | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-10-0517-39/+145
| | |\ \ \ \
| * | \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-055-9/+30
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-2715-60/+147
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-139-22/+61
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-1315-52/+114
| | |\ \ \ \ \ \ \
| | * | | | | | | | Lighthouse CompilefixJørgen Lind2010-09-091-1/+2
| | * | | | | | | | Lighthouse: Various compiler warning/error fixesJørgen Lind2010-09-095-12/+3
| | * | | | | | | | Lighthouse: fix reparenting from topLevel to child widgetJørgen Lind2010-09-071-8/+10
| | * | | | | | | | Make phonon gst backend build properlyJørgen Lind2010-09-071-21/+29
| | * | | | | | | | Lighthouse: Fix eventhandling for when widgets are in destructorJørgen Lind2010-09-031-0/+23
| | * | | | | | | | Initial pluggable fontdatabaseJørgen Lind2010-09-022-0/+15
| | * | | | | | | | Remove listing all platform plugins on loadJørgen Lind2010-08-261-1/+0
| * | | | | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-1321-63/+171
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Experimental multi-touch implementationPaul Olav Tvete2010-09-081-1/+1
| * | | | | | | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-268-5/+791
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-08-265-25/+36
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Oops, fix cut and paste bug in kernel.priPaul Olav Tvete2010-08-261-2/+2
| | * | | | | | | | | | Move qplatformcursor from gui/painting to gui/kernelPaul Olav Tvete2010-08-203-2/+771
| | * | | | | | | | | | Clean up lighthouse header filesPaul Olav Tvete2010-08-205-4/+21
| * | | | | | | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-265-27/+42
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-1918-86/+188
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-1921-101/+273
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Lighthouse: don't force sending key events to the TLWJørgen Lind2010-08-181-3/+0
| | * | | | | | | | | | | | Lighthouse:Only native children uses setParentJørgen Lind2010-08-181-3/+5
| | * | | | | | | | | | | | Revert "Allow customizing the default fbo from the QPlatformGLContext."Jørgen Lind2010-08-112-13/+0
| | * | | | | | | | | | | | Cleaned up in includes in Lighthouse headerfilesJørgen Lind2010-08-064-4/+13
| | * | | | | | | | | | | | Allow customizing the default fbo from the QPlatformGLContext.Christian Kamm2010-08-062-0/+13
| | * | | | | | | | | | | | Make the GLX integration give more correct formatJørgen Lind2010-08-062-0/+31