summaryrefslogtreecommitdiffstats
path: root/src/multimedia/playback
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Video, Playback: replace foreach with range-based forAnton Kudryavtsev2016-01-152-4/+7
* | fix expensive iteration over QMap::keys() and QHash::keys()Anton Kudryavtsev2016-01-141-3/+3
* | Add moveItem(from, to) to QMediaPlaylist.Jim Hodapp2015-12-186-0/+41
|/
* Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-08-242-14/+30
|\
| * QMediaPlayer: clear current playlist on deletion.Yoann Lopes2015-08-191-0/+2
| * Bind the playlist connected to a player.Loïc Molinari2015-08-121-0/+2
| * 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
* | Add audio role API to QMediaPlayer.Jim Hodapp2015-08-102-0/+75
|/
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-152-20/+15
|\
| * Use proper d_ptr for QPlaylistFileParser.Yoann Lopes2015-03-182-21/+15
* | Fix tr()-context of message in QMediaPlayerPrivate.Friedemann Kleint2015-04-091-1/+1
* | QMediaPlayer: handle resource files in a cross-platform way.Yoann Lopes2015-04-072-32/+126
* | Remove stray <QtNetwork> includesAndrew Knight2015-03-302-1/+3
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-131-1/+1
|\|
| * Fix some typosSergio Ahumada2015-02-111-1/+1
* | Update copyright headersAntti Kokko2015-02-1219-133/+133
|/
* Merge remote-tracking branch 'origin/5.3' into 5.4Sergio Ahumada2014-09-262-115/+36
|\
| * Make PLS parser more permissive.Yoann Lopes2014-09-101-92/+10