Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-11-12 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int... | Qt Continuous Integration System | 2010-11-11 | 4 | -77/+157 |
| |\ | |||||
| | * | Doc: Fixing typo | Sergio Ahumada | 2010-11-11 | 1 | -1/+1 |
* | | | Code style cleanup for merge request 847 | Jan-Arve Sæther | 2010-11-12 | 1 | -4/+4 |
* | | | Merge branch 'fixes-to-merge-requests' into 4.7 | Jan-Arve Sæther | 2010-11-12 | 1 | -50/+45 |
|\ \ \ | |||||
| * | | | Fix a behaviour change of sizeHint() introduced by 6d4d265e7e67dde58 | Jan-Arve Sæther | 2010-11-11 | 1 | -50/+45 |
* | | | | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-11-11 | 1 | -1/+4 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-11-11 | 1 | -1/+4 |
| |\ \ \ | |||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-11-10 | 1 | -1/+4 |
| | |\ \ \ | |||||
| | | * | | | Clear X11 structure before use | Harald Fernengel | 2010-11-09 | 1 | -1/+4 |
* | | | | | | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-11-10 | 14 | -26/+91 |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-10 | 13 | -26/+87 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-09 | 13 | -26/+87 |
| | |\ \ \ | |||||
| | | * | | | Doc: Fixing typo | Sergio Ahumada | 2010-11-09 | 8 | -12/+12 |
| | | * | | | Fixed tst_qwidget::testContentsPropagation auto-test failure. | Samuel Rødal | 2010-11-09 | 1 | -3/+5 |
| | | * | | | Fixed text rendering bug in raster engine when opacity != 1.0. | Samuel Rødal | 2010-11-08 | 1 | -1/+3 |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-05 | 5 | -15/+72 |
| | | |\ \ \ | | | | |/ / | | | |/| | | |||||
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-05 | 5 | -15/+72 |
| | | | |\ \ | |||||
| | | | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-03 | 5 | -15/+72 |
| | | | | |\ \ | |||||
| | | | | | * | | Fixed grabWidget sometimes returning uninitialized memory. | Samuel Rødal | 2010-11-03 | 1 | -2/+3 |
| | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-01 | 4 | -13/+69 |
| | | | | | |\ \ | |||||
| | | | | | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-30 | 4 | -13/+69 |
| | | | | | | |\ \ | |||||
| | | | | | | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-29 | 4 | -13/+69 |
| | | | | | | | |\ \ | |||||
| | | | | | | | | * | | Fix possible crash in QStaticText and QDeclarativeTextLayout | Eskil Abrahamsen Blomfeldt | 2010-10-29 | 4 | -13/+69 |
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-11-09 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Fixed random crash in QGestureManager. | Dominik Holland | 2010-11-09 | 1 | -0/+4 |
| | |/ / / / / / / / | |||||
* | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-11-09 | 3 | -1/+91 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-05 | 3 | -1/+91 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Merge branch 'QT-4077-fix' into 4.7-s60 | axis | 2010-11-05 | 3 | -1/+91 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Fixed event starvation with pointer events on Symbian. | axis | 2010-11-05 | 3 | -1/+91 |
* | | | | | | | | | | QS60Style: Color calculation should be optimized | Sami Merila | 2010-11-09 | 2 | -5/+5 |
* | | | | | | | | | | QS60Style: Color calculation should be optimized | Sami Merila | 2010-11-09 | 3 | -59/+130 |
* | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-11-05 | 7 | -29/+55 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 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' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-11-05 | 1 | -8/+17 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Prevent excessive seeks in xbm detection | Harald Fernengel | 2010-11-04 | 1 | -8/+17 |
| | |/ / / / / / | |||||
| * | | | | | | | Remove code changes that were NOT intended as part of the fix | Sami Merila | 2010-11-04 | 2 | -19/+0 |
| * | | | | | | | Wordwrap QInputDialog label in Symbian | Janne Koskinen | 2010-11-04 | 1 | -0/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-11-04 | 7 | -37/+65 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-11-03 | 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 '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration | Qt Continuous Integration System | 2010-11-03 | 2 | -30/+34 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-11-01 | 3 | -6/+6 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-30 | 1 | -0/+3 |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | |||||
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-29 | 8 | -12/+104 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | |