summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/stagi...Frederik Gladhorn2013-08-1310-16/+389
|\
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-1210-16/+389
| |\
| | * Implement resource policy plugin using libresourceqt.Robin Burchell2013-08-057-0/+375
| | * Fixed bug in QWaveDecoder.Yoann Lopes2013-08-051-14/+11
| | * Change libresourceqt's .pc file.Robin Burchell2013-08-052-2/+2
* | | Doc: Renamed HTML file for "Qt Multimedia on Windows" page.Jerome Pasion2013-08-121-1/+1
|/ /
* | Merge branch 'stable' into devSergio Ahumada2013-08-053-9/+47
|\|
| * Make PulseAudio implementation of QSoundEffect more robust.Yoann Lopes2013-07-252-8/+47
| * Moved declarative-camera example in the right directory.Yoann Lopes2013-07-241-1/+0
* | Doc: Setting \qtvariable values in module pages.Jerome Pasion2013-08-022-0/+2
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-234-19/+45
|\|
| * DirectShow: avoid unnecessary RGB32 -> BGR32 conversion.Yoann Lopes2013-07-191-1/+1
| * DirectShow: Don't create the widget and renderer controls until requested.Yoann Lopes2013-07-192-15/+31
| * WMF: fixed MediaPlayer buffering logic.Yoann Lopes2013-07-191-3/+13
* | OpenSL ES audio plugin.Yoann Lopes2013-07-1913-0/+2084
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-1110-30/+158
|\|
| * Android: removed unnecessary init class for QtMultimedia.jarYoann Lopes2013-07-091-2/+2
| * Android: Make it possible for MediaPlayer to read from assets.Christian Strømme2013-07-091-1/+14
| * Android: wait to have a valid video surface before loading a media.Yoann Lopes2013-07-095-27/+130
| * Android: release the Android media player before destroying it.Yoann Lopes2013-07-093-0/+8
| * Fix resource leak in directshow plugin.tommyadam2013-07-041-0/+4
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-2719-41/+64
|\|
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-2517-17/+38
| |\
| | * Multimedia plugins now have a unique JSON metadata 'Keys' property.Yoann Lopes2013-06-2117-17/+38
| * | Use correct default audio output and input devices on Windows.Yoann Lopes2013-06-251-10/+12
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-201-14/+14
| |\|
| | * Android: Fix for uncaught java exception.Christian Strømme2013-06-131-14/+14
* | | Doc: Setting navigation variables for Multimedia and Multimedia WidgetsJerome Pasion2013-06-262-0/+7
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-208-16/+118
|\| |
| * | Doc: Fix some broken links and quote pathsSze Howe Koh2013-06-131-3/+3
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-124-5/+66
| |\|
| | * Doc: Add Qt Multimedia platform notes for Windowsv5.1.0-rc1Topi Reinio2013-06-042-0/+58
| | * Doc: Adding import statement for in Qt Multimedia QML TypesJerome Pasion2013-06-031-4/+7
| | * Fix typo in QMediaPlayer docs.Mitch Curtis2013-05-311-1/+1
| * | BlackBerry: Fix frame size of video playbackTobias Koenig2013-06-053-8/+49
| |/
* | Purged ALSA implementationBernd Weimer2013-06-112-153/+75
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-046-5/+22
|\|
| * Update all plugins.qmltypes filesLiang Qi2013-05-271-0/+13
| * WMF-plugin: Fix warnings about unused variables.Friedemann Kleint2013-05-272-2/+3
| * Update qmldir file for QtAudioEngineLiang Qi2013-05-271-0/+2
| * Doc: Removed multimedia overview from "technology-apis" group.Jerome Pasion2013-05-241-2/+0
| * Android: add libQt5MultimediaQuick_p to the list of dependencies.Christian Strømme2013-05-231-1/+4
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-2337-111/+226
|\|
| * Android: fixed crash when resetting the video surface.Yoann Lopes2013-05-221-1/+2
| * Fixed signal not being emitted in QDeclarativeCameraFocus.Yoann Lopes2013-05-171-1/+4
| * Make directshow-plugin available.Friedemann Kleint2013-05-155-4/+17
| * Decouple qmediametadata.h from qmultimedia.hSze Howe Koh2013-05-1414-4/+15
| * VideoOutput: Take the surface's viewport into accountThomas McGuire2013-05-076-14/+74
| * Doc: Fix missing element name in VideoMasaya TAKAHASHI2013-05-061-15/+15
| * Doc: Define example install paths in .qdocconfTopi Reinio2013-05-032-0/+6