Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-05 | 3 | -2/+35 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-11-04 | 3 | -2/+35 |
| |\ | |||||
| | * | Added environment variable for style overriding. | Dominik Holland | 2010-11-02 | 1 | -2/+10 |
| | * | Cleanup Meego Compositor detection | Harald Fernengel | 2010-11-02 | 2 | -28/+18 |
| | * | Added Maemo 6 to the X11 desktopEnvironment list | Dominik Holland | 2010-11-02 | 2 | -0/+35 |
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-11-04 | 1 | -4/+6 |
|\ \ \ | |/ / | |||||
| * | | The lastCenterPoint should be equal to centerPoint for new gestures. | Frederik Gladhorn | 2010-11-03 | 1 | -3/+5 |
| * | | PinchGesture: lastRotationAngle should start at 0. | Frederik Gladhorn | 2010-11-03 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-11-03 | 2 | -0/+9 |
|\ \ | |||||
| * | | Add member-swap to shared datatypes that don't have it. | Marc Mutz | 2010-11-03 | 2 | -0/+9 |
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-11-02 | 1 | -1/+1 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Fix a few typos in comments and docs. | Jason McDonald | 2010-11-01 | 1 | -1/+1 |
* | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-30 | 4 | -10/+23 |
|\ \ | |/ | |||||
| * | Avoid being killed by graphics out-of-memory monitor. | Jason Barron | 2010-10-29 | 1 | -0/+11 |
| * | Do not crash on Symbian | Alessandro Portale | 2010-10-28 | 2 | -3/+9 |
| * | Fixed crash with QClipboard in Symbian^3 | Titta Heikkala | 2010-10-28 | 1 | -7/+3 |
* | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into... | Qt Continuous Integration System | 2010-10-29 | 47 | -32/+7235 |
|\ \ | |||||
| * | | Fix the license in files for Lighthouse | Jørgen Lind | 2010-10-28 | 2 | -0/+82 |
| * | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-26 | 17 | -63/+247 |
| |\ \ | |||||
| * \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-22 | 20 | -58/+142 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-10-22 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Lighthouse on OS X. | Morten Johan Sørvig | 2010-10-20 | 1 | -1/+1 |
| | * | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-10-05 | 17 | -39/+145 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-05 | 5 | -9/+30 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Gunnar Sletta | 2010-09-27 | 15 | -60/+147 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-09-13 | 9 | -22/+61 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge branch 'qt-4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-09-13 | 15 | -52/+114 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Lighthouse Compilefix | Jørgen Lind | 2010-09-09 | 1 | -1/+2 |
| | * | | | | | | | | Lighthouse: Various compiler warning/error fixes | Jørgen Lind | 2010-09-09 | 5 | -12/+3 |
| | * | | | | | | | | Lighthouse: fix reparenting from topLevel to child widget | Jørgen Lind | 2010-09-07 | 1 | -8/+10 |
| | * | | | | | | | | Make phonon gst backend build properly | Jørgen Lind | 2010-09-07 | 1 | -21/+29 |
| | * | | | | | | | | Lighthouse: Fix eventhandling for when widgets are in destructor | Jørgen Lind | 2010-09-03 | 1 | -0/+23 |
| | * | | | | | | | | Initial pluggable fontdatabase | Jørgen Lind | 2010-09-02 | 2 | -0/+15 |
| | * | | | | | | | | Remove listing all platform plugins on load | Jørgen Lind | 2010-08-26 | 1 | -1/+0 |
| * | | | | | | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-09-13 | 21 | -63/+171 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Experimental multi-touch implementation | Paul Olav Tvete | 2010-09-08 | 1 | -1/+1 |
| * | | | | | | | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-08-26 | 8 | -5/+791 |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'qt-4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-26 | 5 | -25/+36 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Oops, fix cut and paste bug in kernel.pri | Paul Olav Tvete | 2010-08-26 | 1 | -2/+2 |
| | * | | | | | | | | | | Move qplatformcursor from gui/painting to gui/kernel | Paul Olav Tvete | 2010-08-20 | 3 | -2/+771 |
| | * | | | | | | | | | | Clean up lighthouse header files | Paul Olav Tvete | 2010-08-20 | 5 | -4/+21 |
| * | | | | | | | | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-26 | 5 | -27/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 18 | -86/+188 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-19 | 21 | -101/+273 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Lighthouse: don't force sending key events to the TLW | Jørgen Lind | 2010-08-18 | 1 | -3/+0 |
| | * | | | | | | | | | | | | Lighthouse:Only native children uses setParent | Jørgen Lind | 2010-08-18 | 1 | -3/+5 |
| | * | | | | | | | | | | | | Revert "Allow customizing the default fbo from the QPlatformGLContext." | Jørgen Lind | 2010-08-11 | 2 | -13/+0 |
| | * | | | | | | | | | | | | Cleaned up in includes in Lighthouse headerfiles | Jørgen Lind | 2010-08-06 | 4 | -4/+13 |
| | * | | | | | | | | | | | | Allow customizing the default fbo from the QPlatformGLContext. | Christian Kamm | 2010-08-06 | 2 | -0/+13 |
| | * | | | | | | | | | | | | Make the GLX integration give more correct format | Jørgen Lind | 2010-08-06 | 2 | -0/+31 |