summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Add 'resourcepolicy' to MODULE_PLUGIN_TYPES of multimedia.pro.v5.6.0-alpha1Friedemann Kleint2015-09-031-1/+2
* Fix MediaPlayer::playlist documentation.Yoann Lopes2015-08-242-0/+6
* Fix QCamera::lockStatus() documentation.Yoann Lopes2015-08-241-1/+1
* Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-08-2451-1966/+1149
|\
| * Android: minor refactor of the camera frame callback.Yoann Lopes2015-08-205-123/+121
| * Android: fix video probes when recording the camera.Yoann Lopes2015-08-203-12/+30
| * QMediaPlayer: clear current playlist on deletion.Yoann Lopes2015-08-191-0/+2
| * GStreamer: refactored widget and window control.Yoann Lopes2015-08-1811-446/+707
| * Fix QCamera viewfinder capabilities functions..Yoann Lopes2015-08-183-4/+8
| * Avoid races when sending EOSRicardo Salveti de Araujo2015-08-181-2/+2
| * GStreamer: added convenience function in QGstUtils.Yoann Lopes2015-08-135-8/+18
| * Fix camera plugin selection.Yoann Lopes2015-08-121-8/+3
| * Remove obsolete check in QMediaServiceChristian Strømme2015-08-121-2/+0
| * Bind the playlist connected to a player.Loïc Molinari2015-08-121-0/+2
| * Doc: Corrected a typo.Venugopal Shivashankar2015-08-112-3/+3
| * Fix documentation for QML metaData property.Yoann Lopes2015-08-113-1231/+139
| * Fix qdoc warnings.Yoann Lopes2015-08-118-26/+70
| * Doc: update qml module version to 5.5.Yoann Lopes2015-08-1120-82/+6
| * Improve documentation for mediaObject property.Yoann Lopes2015-08-112-19/+26
| * Emit mediaAboutToBeRemoved() before mediaRemoved() in QMediaPlaylist.Loïc Molinari2015-08-101-1/+3
| * Check and fix up bounds in QMediaPlaylist methods.Loïc Molinari2015-08-101-6/+16
| * Clean up QMediaPlayer documentation.Loïc Molinari2015-08-101-7/+7
* | Fix 2 more tr()-contexts of messages in QPlaylistFileParserPrivate.Friedemann Kleint2015-08-191-2/+2
* | Fix tr()-context of messages in QPlaylistFileParserPrivate.Friedemann Kleint2015-08-191-1/+2
* | Make QWinRTImageEncoderControl a Q_OBJECT.Friedemann Kleint2015-08-191-0/+1
* | winrt: Fix aspect ratio deviation between preview and encoding streamsSamuel Nevala2015-08-182-70/+95
* | Add audio role API to QMediaPlayer.Jim Hodapp2015-08-1012-5/+541
* | winrt: Add camera video probe controlsPeng Wu2015-08-107-13/+271
* | winrt: Add camera focus and focus lock controlsPeng Wu2015-08-1010-27/+1003
* | Added new playlist QML type.Loïc Molinari2015-08-108-3/+897
* | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-0923-139/+115
|\|
| * Add new property to QVideoSurfaceFormat.Yoann Lopes2015-08-073-14/+47
| * Fix warnings about unused private fieldsThiago Macieira2015-08-068-9/+5
| * Don't list avfcamerainfocontrol header and sources twiceThiago Macieira2015-08-061-2/+0
| * GStreamer: use QMediaStorageLocation to generate capture file names.Yoann Lopes2015-08-042-70/+14
| * GStreamer: fix possible integer overflow in comparison.Yoann Lopes2015-08-041-1/+1
| * winrt: Fix crash during certain video operationsPeng Wu2015-07-281-27/+10
| * Fix video nodes material comparison.Yoann Lopes2015-07-203-0/+11
| * Doc: replace Mac OS X with OS XNico Vertriest2015-07-153-3/+3
| * GStreamer: fix supported values returned by CameraBinImageProcessing.Yoann Lopes2015-07-141-11/+22
| * WindowsAudio: Fix compiler warnings by g++/MinGW.Friedemann Kleint2015-07-131-2/+2
* | Prospective fix for building QtMultimedia on Android against installed QtBaseSimon Hausmann2015-07-231-1/+1
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-2929-84/+443
|\|
| * Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-2621-44/+122
| |\
| | * QCameraViewFinderSettings: add missing includev5.5.0-rc1v5.5.0Marc Mutz2015-06-141-0/+1
| | * QAbstractVideoFilter: make ctor explicitMarc Mutz2015-06-121-1/+1
| | * QCameraViewFinderSettings: make op== transitiveMarc Mutz2015-06-121-2/+2
| | * QCameraViewFinderSettings: declare sharedMarc Mutz2015-06-121-0/+7
| | * QCameraViewFinderSettings: make op== non-memberMarc Mutz2015-06-122-16/+22
| | * QCameraViewFinderSettings: use correct includeMarc Mutz2015-06-121-1/+2