summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary dependency to qtjsbackend from sync.profileSimon Hausmann2013-08-161-1/+0
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/stagi...Frederik Gladhorn2013-08-1311-17/+390
|\
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-1211-17/+390
| |\
| | * 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-053-3/+3
* | | Doc: Renamed HTML file for "Qt Multimedia on Windows" page.Jerome Pasion2013-08-121-1/+1
|/ /
* | Merge branch 'stable' into devSergio Ahumada2013-08-0536-25/+62
|\|
| * Remove left-over debug output.Friedemann Kleint2013-07-311-1/+0
| * Fix file browser in qmlvideo example.Friedemann Kleint2013-07-302-8/+12
| * fix build without quickOswald Buddenhagen2013-07-301-1/+1
| * Make PulseAudio implementation of QSoundEffect more robust.Yoann Lopes2013-07-252-8/+47
| * Use the new (-no)-wmf-backend configuration optionWouter Huysentruit2013-07-251-1/+1
| * Moved declarative-camera example in the right directory.Yoann Lopes2013-07-2431-7/+2
| * Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
* | 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-1916-0/+2134
* | 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-2730-54/+119
|\|
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-2522-21/+84
| |\
| | * Add changes-5.1.0 filev5.1.0-rc2v5.1.0Sergio Ahumada2013-06-211-0/+38
| | * Multimedia plugins now have a unique JSON metadata 'Keys' property.Yoann Lopes2013-06-2121-21/+46
| * | 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-207-23/+23
| |\|
| | * Android: Fix for uncaught java exception.Christian Strømme2013-06-131-14/+14
| | * Fix for url bug in the qmlvideo examples.Christian Strømme2013-06-136-9/+9
* | | Doc: Setting navigation variables for Multimedia and Multimedia WidgetsJerome Pasion2013-06-262-0/+7
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-2013-59/+155
|\| |
| * | Doc: Fix some broken links and quote pathsSze Howe Koh2013-06-133-35/+35
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-127-16/+69
| |\|
| | * 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
| | * Android: Fix compilation on WindowsEskil Abrahamsen Blomfeldt2013-05-283-11/+3
| * | disable module when gui is not availableTasuku Suzuki2013-06-101-0/+2
| * | 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-047-9/+27
|\| |
| * | Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-291-1/+1
| |/
| * Update all plugins.qmltypes filesLiang Qi2013-05-271-0/+13
| * WMF-plugin: Fix warnings about unused variables.Friedemann Kleint2013-05-272-2/+3