summaryrefslogtreecommitdiffstats
path: root/src/multimedia/playback
Commit message (Expand)AuthorAgeFilesLines
* Do not use QMediaResource in QMediaContentVaL Doroshchuk2019-02-221-56/+31
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-091-0/+3
|\
| * Fix crash in player example when close the window while playingVaL Doroshchuk2019-02-081-0/+3
* | multimedia: modernize by using nullptrJochen Seemann2019-01-0411-73/+73
* | Deprecate QMediaResource classVal Doroshchuk2018-11-054-5/+62
* | Do not use QMediaResource internallyVal Doroshchuk2018-08-302-22/+13
|/
* QMediaPlayer: remove else after returnAndre Hartmann2018-04-301-2/+3
* Doc: Remove space that causes QDoc warningPaul Wicking2018-04-181-1/+1
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-061-1/+11
|\
| * Update player state after QMediaPlayer::EndOfMediaVal Doroshchuk2017-12-201-1/+11
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-202-3/+3
|\|
| * Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-032-3/+3
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-271-1/+2
|\|
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-271-1/+2
| |\
| | * Fix loading remote m3u filesVaL Doroshchuk2017-10-091-1/+2
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-273-8/+8
* | | Update customAudioRole Qt versionJames McDonnell2017-09-191-3/+3
* | | Add custom audio role API to QMediaPlayerJames McDonnell2017-09-062-2/+95
|/ /
* / Use QRandomGenerator instead of q?randThiago Macieira2017-06-302-3/+5
|/
* Fix build for -no-feature-temporaryfileStephan Binner2017-05-081-0/+4
* Add missing override and remove redundant virtualAlexander Volkov2016-12-127-42/+42
* Improve the playlist parserChristian Strømme2016-12-124-176/+312
* Add proper global headers for QtMultimediaLars Knoll2016-11-234-4/+4
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-111-10/+10
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-041-10/+10
| |\
| | * Reduce size of QMediaPlayerPrivateChristian Stromme2016-10-191-10/+10
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-10-112-3/+3
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-042-3/+3
| |\|
| | * Doc: Add comment about stream requirementsChristian Strømme2016-09-281-2/+2
| | * Remove useless castChristian Strømme2016-09-281-1/+1
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-191-2/+4
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-171-2/+4
| |\|
| | * Optimize QMediaPlaylistPrivate::readItems()Yoann Lopes2016-08-311-2/+4
* | | Improve audio volume documentationYoann Lopes2016-08-221-2/+8
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-171-7/+9
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-131-7/+9
| |\|
| | * Fix playing a playlist containing an invalid media as first itemYoann Lopes2016-08-121-7/+9
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-091-1/+1
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-041-1/+1
| |\|
| | * QPlaylistFileParser: fix QUrl::resolved+QUrl::fromLocalFile misuseDavid Faure2016-08-041-1/+1
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-061-3/+7
|\| |
| * | Add missing implementation for QMediaPlaylist::moveMedia().Yoann Lopes2016-04-271-3/+9
| * | Fix unused variable warningChristian Stromme2016-04-201-2/+0
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-082-9/+9
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-072-9/+9
| |\|
| | * Add explicit and make public headers compile with -Wzero-as-null-pointer-cons...Marc Mutz2016-03-032-9/+9
* | | Pass by QUrl by const-ref, it's non-trivial.Sergio Martins2016-03-021-2/+2
|/ /
* | Updated license headersAntti Kokko2016-01-1919-266/+380
* | Merge remote-tracking branch 'origin/5.6' into devChristian Strømme2016-01-152-8/+68
|\|
| * Change the way a playlist is bound to a media object.v5.6.0-beta1Yoann Lopes2015-12-112-8/+68