Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-10-25 | 6 | -79/+104 |
|\ | |||||
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Olivier Goffart | 2010-10-25 | 6 | -79/+104 |
| |\ |/ / | |||||
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-10-13 | 2 | -79/+90 |
| |\ | |||||
| | * | Demo Spectrum wav data size is not calculated correctly | Justin McPherson | 2010-10-13 | 2 | -79/+90 |
| |/ | |||||
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-10-12 | 1 | -0/+0 |
| |\ | |||||
| | * | Rename .pro file to match directory name. | Jason McDonald | 2010-10-12 | 1 | -0/+0 |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-10-12 | 4 | -16/+4 |
| |\ \ | | |/ | |/| | |||||
| | * | Revert "Don't define highp/mediump/lowp if desktop GL has them" | Trond Kjernåsen | 2010-10-12 | 4 | -16/+4 |
| |/ | |||||
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-10-11 | 3 | -0/+14 |
| |\ | |||||
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-10-11 | 3 | -0/+14 |
| | |\ | |/ / | |||||
| | * | Add header guards to audio example headers. | Justin McPherson | 2010-10-08 | 3 | -0/+14 |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-10-11 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Doc: Fixed qdoc warning. | David Boddie | 2010-10-08 | 1 | -1/+1 |
| | |/ | |||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-10-24 | 1 | -3/+11 |
|\ \ \ | |||||
| * | | | Fix warning introduced by last commit on hiding of the 'd' member | Thiago Macieira | 2010-10-24 | 1 | -2/+2 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-10-23 | 1 | -3/+11 |
| |\ \ \ |/ / / / | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-10-22 | 1 | -3/+11 |
| |\ \ \ | |||||
| | * | | | Fix access to uninitialised memory in case of new throwing | Thiago Macieira | 2010-10-22 | 1 | -3/+11 |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-10-23 | 12 | -34/+213 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-10-22 | 12 | -34/+213 |
| |\ \ \ \ | |||||
| | * | | | | Corrected build fail for autotests | Titta Heikkala | 2010-10-22 | 1 | -2/+2 |
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7 | Sami Merila | 2010-10-22 | 5 | -13/+109 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-10-22 | 11 | -33/+212 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-10-21 | 11 | -33/+212 |
| | | | |\ \ \ \ | |||||
| | * | | | | | | | QComboBox popup is shown in incorrect location with bottom CBA | Sami Merila | 2010-10-22 | 1 | -1/+1 |
| | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | QS60Style: The QComboBox/QSpinBox text color is not according to theme | Sami Merila | 2010-10-21 | 1 | -4/+1 |
| | * | | | | | | Using TLS to store QThreadData on Symbian | mread | 2010-10-21 | 1 | -8/+38 |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7 | Janne Koskinen | 2010-10-21 | 8 | -14/+40 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Functions that are externally defined to QtOpenGL needs to be imported. | Jani Hautakangas | 2010-10-21 | 6 | -11/+11 |
| | * | | | | | | | Added include for missing file for Symbian3 | Titta Heikkala | 2010-10-21 | 2 | -0/+6 |
| | * | | | | | | | Support for clipboard between Qt and Symbian applications | Titta Heikkala | 2010-10-21 | 3 | -10/+156 |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-10-22 | 2 | -41/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Remove accidentially committed .qmlproject.user file, ignore this filetype | Daniel Molkentin | 2010-10-22 | 2 | -41/+1 |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-22 | 18 | -352/+498 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-22 | 18 | -352/+498 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | Fall back to Qt for loading images with DICAPS_COLORKEY. | Anders Bakken | 2010-10-21 | 1 | -7/+11 |
| | * | | | | | | | Implement QWidget::metric PdmNumColors for QWS | Anders Bakken | 2010-10-21 | 1 | -0/+24 |
| | * | | | | | | | Adding ::scroll capabilities to live pixmaps. | Michael Dominic K | 2010-10-21 | 2 | -3/+70 |
| | * | | | | | | | Major refactoring: creating a new QPixmapData subclass for live textures. | Michael Dominic K | 2010-10-21 | 16 | -345/+396 |
| | | |_|_|/ / / | | |/| | | | | | |||||
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-10-22 | 2 | -21/+23 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Fix Flipable docs | Bea Lam | 2010-10-22 | 2 | -21/+23 |
|/ / / / / / | |||||
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-10-21 | 1 | -2/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Remove unnecessary rounding | Alan Alpert | 2010-10-21 | 1 | -2/+0 |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-21 | 3 | -2/+82 |
|\ \ \ \ \ \ | |||||
| * | | | | | | In meego, support Format_RGB32 too for eglShared images. | Michael Dominic K | 2010-10-21 | 1 | -2/+3 |
| * | | | | | | Make sure d->ranges does not have invalid ranges before processing it. | Stephen Kelly | 2010-10-21 | 2 | -0/+79 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-10-21 | 2 | -9/+27 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-10-21 | 2 | -3/+29 |
| |\ \ \ \ | |||||
| * | | | | | Flickable 'moving' parameter stays at true when setting contentY. | Martin Jones | 2010-10-21 | 2 | -9/+27 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-10-21 | 2 | -3/+29 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / |