summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-065-15/+59
|\
| * Linux QAudioOutput playback stutteringKurt Korbatits2010-03-041-1/+43
| * Fix namespace issues.Justin McPherson2010-03-024-13/+13
| * Fix Audio input on OSX 10.6.Justin McPherson2010-03-021-1/+3
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-053-4/+4
|\ \
| * | Fix spelling in enumeration.Justin McPherson2010-03-053-4/+4
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-052-8/+8
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-042-8/+8
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-042-8/+8
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-032-8/+8
| | | |\ \ \
| | | | * \ \ Merge remote branch 'berlin/4.7' into 4.7Oswald Buddenhagen2010-03-021-4/+4
| | | | |\ \ \
| | | | | * | | compileHarald Fernengel2010-03-011-4/+4
| | | | * | | | OS X 10.4 compile error; required casting int to GLint.Martin Smith2010-03-021-4/+4
* | | | | | | | MouseRegion is dead. Long live MouseArea.Martin Jones2010-03-041-1/+1
|/ / / / / / /
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-041-10/+11
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Finish to resolve merge conflict.Olivier Goffart2010-03-041-10/+11
| |/ / / / /
* | | | | | WaveDecoder; be more permissive in handling of wave file formats.Justin McPherson2010-03-042-6/+16
* | | | | | Debug media player status and media state changes.Dmytro Poplavskiy2010-03-041-1/+17
* | | | | | Added QMediaPlayer::StreamPlayback flag to query/select backend capableDmytro Poplavskiy2010-03-044-14/+53
|/ / / / /
* | | | | Remove dependency on declarative from multimedia.Justin McPherson2010-03-0323-2856/+26
|/ / / /
* | | | Fixed compiler warnings when compiling multimedia module.Kurt Korbatits2010-03-033-7/+11
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-274-0/+19
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-264-0/+19
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' of git:qt/qt-multimedia-staging into qmlThiago Macieira2010-02-264-0/+19
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-264-0/+19
| | | |\ \
| | | | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-stagingJustin McPherson2010-02-252-0/+10
| | | | |\ \
| | | | | * | QMediaContent: Add a convenience method to retrieve the QNetworkRequest.Justin McPherson2010-02-252-0/+10
| | | | * | | Qt namespace fixes.Justin McPherson2010-02-252-0/+9
| | | | |/ /
* | | | | | Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-2716-349/+332
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-266-230/+211
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-266-230/+211
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/|
| | | * | win32 backend for low-level audio doesn't pass new unit testsKurt Korbatits2010-02-232-26/+78
| | | * | alsa backend for low-level audio doesn't pass new unit testsKurt Korbatits2010-02-232-118/+67
| | | * | Updates to low-level audio documentation.Kurt Korbatits2010-02-232-86/+66
| * | | | Merge remote branch 'qt/master' into qml-masterQt Continuous Integration System2010-02-2622-8/+31
| |\ \ \ \ | | |/ / /
| * | | | Introduced QDeclarativeExtensionPlugin::registerTypes(uri).Roberto Raggi2010-02-252-8/+5
| * | | | Fix up some rename confusion.Justin McPherson2010-02-253-133/+1
| * | | | Make QML_REGISTER...TYPE functions unnecessary (still exist for now).Warwick Allison2010-02-251-4/+4
| * | | | Fix include of renamed headerJustin McPherson2010-02-252-2/+2
| * | | | Change Multimedia declarative module in line with recent commits.Justin McPherson2010-02-252-7/+12
| * | | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-2411-6/+201
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec...Warwick Allison2010-02-2410-119/+119
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-2412-26/+39
| |\ \ \ \
| * | | | | Get rid of QmlModulePlugin.Roberto Raggi2010-02-232-5/+9
* | | | | | doc: Added \since 4.7 to several \qmlclass elements.Martin Smith2010-02-263-0/+3
| |_|_|/ / |/| | | |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-2422-8/+31
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Doc: add \since 4.7 to new QtMultimedia classesVolker Hilsheimer2010-02-2422-8/+31
| | |/ / | |/| |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2410-3/+72
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2310-3/+72
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2310-3/+72
| | |\ \ \
generated by cgit v0.12 at 2024-12-28 16:51:07 (GMT)