Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | doc: Fixed several qdoc errors. | Martin Smith | 2010-03-09 | 1 | -2/+0 |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-03-08 | 10 | -467/+200 |
|\ | |||||
| * | Remove duration property from QSoundEffect. | Justin McPherson | 2010-03-08 | 8 | -44/+0 |
| * | Fix effects.pri. | Justin McPherson | 2010-03-08 | 1 | -2/+2 |
| * | Refactor QSoundEffect. | Justin McPherson | 2010-03-08 | 9 | -440/+217 |
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Rohan McGovern | 2010-03-06 | 5 | -15/+59 |
|\ \ | |/ |/| | |||||
| * | Linux QAudioOutput playback stuttering | Kurt Korbatits | 2010-03-04 | 1 | -1/+43 |
| * | Fix namespace issues. | Justin McPherson | 2010-03-02 | 4 | -13/+13 |
| * | Fix Audio input on OSX 10.6. | Justin McPherson | 2010-03-02 | 1 | -1/+3 |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-03-05 | 3 | -4/+4 |
|\ \ | |||||
| * | | Fix spelling in enumeration. | Justin McPherson | 2010-03-05 | 3 | -4/+4 |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-05 | 2 | -8/+8 |
|\ \ \ | |||||
| * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-04 | 2 | -8/+8 |
| |\ \ \ | |||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-04 | 2 | -8/+8 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-03 | 2 | -8/+8 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge remote branch 'berlin/4.7' into 4.7 | Oswald Buddenhagen | 2010-03-02 | 1 | -4/+4 |
| | | | |\ \ \ | |||||
| | | | | * | | | compile | Harald Fernengel | 2010-03-01 | 1 | -4/+4 |
| | | | * | | | | OS X 10.4 compile error; required casting int to GLint. | Martin Smith | 2010-03-02 | 1 | -4/+4 |
* | | | | | | | | MouseRegion is dead. Long live MouseArea. | Martin Jones | 2010-03-04 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-04 | 1 | -10/+11 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Finish to resolve merge conflict. | Olivier Goffart | 2010-03-04 | 1 | -10/+11 |
| |/ / / / / | |||||
* | | | | | | WaveDecoder; be more permissive in handling of wave file formats. | Justin McPherson | 2010-03-04 | 2 | -6/+16 |
* | | | | | | Debug media player status and media state changes. | Dmytro Poplavskiy | 2010-03-04 | 1 | -1/+17 |
* | | | | | | Added QMediaPlayer::StreamPlayback flag to query/select backend capable | Dmytro Poplavskiy | 2010-03-04 | 4 | -14/+53 |
|/ / / / / | |||||
* | | | | | Remove dependency on declarative from multimedia. | Justin McPherson | 2010-03-03 | 23 | -2856/+26 |
|/ / / / | |||||
* | | | | Fixed compiler warnings when compiling multimedia module. | Kurt Korbatits | 2010-03-03 | 3 | -7/+11 |
|/ / / | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-27 | 4 | -0/+19 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-26 | 4 | -0/+19 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge branch 'master' of git:qt/qt-multimedia-staging into qml | Thiago Macieira | 2010-02-26 | 4 | -0/+19 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-26 | 4 | -0/+19 |
| | | |\ \ | |||||
| | | | * \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging | Justin McPherson | 2010-02-25 | 2 | -0/+10 |
| | | | |\ \ | |||||
| | | | | * | | QMediaContent: Add a convenience method to retrieve the QNetworkRequest. | Justin McPherson | 2010-02-25 | 2 | -0/+10 |
| | | | * | | | Qt namespace fixes. | Justin McPherson | 2010-02-25 | 2 | -0/+9 |
| | | | |/ / | |||||
* | | | | | | Merge remote branch 'origin/master' into 4.7 | Thiago Macieira | 2010-02-27 | 16 | -349/+332 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-... | Qt Continuous Integration System | 2010-02-26 | 6 | -230/+211 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-26 | 6 | -230/+211 |
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/| | |||||
| | | * | | win32 backend for low-level audio doesn't pass new unit tests | Kurt Korbatits | 2010-02-23 | 2 | -26/+78 |
| | | * | | alsa backend for low-level audio doesn't pass new unit tests | Kurt Korbatits | 2010-02-23 | 2 | -118/+67 |
| | | * | | Updates to low-level audio documentation. | Kurt Korbatits | 2010-02-23 | 2 | -86/+66 |
| * | | | | Merge remote branch 'qt/master' into qml-master | Qt Continuous Integration System | 2010-02-26 | 22 | -8/+31 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Introduced QDeclarativeExtensionPlugin::registerTypes(uri). | Roberto Raggi | 2010-02-25 | 2 | -8/+5 |
| * | | | | Fix up some rename confusion. | Justin McPherson | 2010-02-25 | 3 | -133/+1 |
| * | | | | Make QML_REGISTER...TYPE functions unnecessary (still exist for now). | Warwick Allison | 2010-02-25 | 1 | -4/+4 |
| * | | | | Fix include of renamed header | Justin McPherson | 2010-02-25 | 2 | -2/+2 |
| * | | | | Change Multimedia declarative module in line with recent commits. | Justin McPherson | 2010-02-25 | 2 | -7/+12 |
| * | | | | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-24 | 11 | -6/+201 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec... | Warwick Allison | 2010-02-24 | 10 | -119/+119 |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-24 | 12 | -26/+39 |
| |\ \ \ \ | |||||
| * | | | | | Get rid of QmlModulePlugin. | Roberto Raggi | 2010-02-23 | 2 | -5/+9 |
* | | | | | | doc: Added \since 4.7 to several \qmlclass elements. | Martin Smith | 2010-02-26 | 3 | -0/+3 |
| |_|_|/ / |/| | | | |