summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-156-24/+13
|\
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-153-24/+10
| |\
| | * Disable wince buildAndreas Holzammer2016-02-051-1/+1
| | * Windows EVR: fix EndOfStream event never being sent.Yoann Lopes2016-02-042-23/+9
| * | Bump versionOswald Buddenhagen2016-02-081-1/+1
| * | RHEL 7.1: Enabling make checkSimo Fält2016-02-043-0/+3
| |/
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-2619-112/+120
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-2111-36/+51
| |\
| | * Fix tst_QAudioOutput::pushSuspendResume().5.5Pasi Petäjäjärvi2016-01-191-2/+3
| | * OpenSL ES: fix QAudioOutput state after resume().Yoann Lopes2016-01-191-1/+1
| | * Alsa: fix QAudioOutput state after resume().Yoann Lopes2016-01-191-1/+1
| | * PulseAudio: fix QAudioOutput state after resume().Yoann Lopes2016-01-191-1/+1
| | * CoreAudio: fix QAudioOutput state after resume().Yoann Lopes2016-01-192-1/+5
| | * WindowsAudio: fix QAudioOutput state after resume().Yoann Lopes2016-01-191-1/+1
| | * GStreamer: fix GstAppSrc usage.Yoann Lopes2016-01-194-29/+39
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-196-10/+8
| |\ \ | | |/
| | * Be more permissive in QSoundEffect integration test.Pasi Petäjäjärvi2016-01-181-1/+1
| | * Fix setting state to not playing when audio error occurredPasi Petäjäjärvi2016-01-141-1/+2
| | * Fix clearing signals already send after first part of audio dataPasi Petäjäjärvi2016-01-131-1/+1
| | * Remove testing category to empty stringPasi Petäjäjärvi2016-01-131-1/+0
| | * Remove checking exact remaining loop amount right after calling play()Pasi Petäjäjärvi2016-01-131-4/+2
| | * Fix usage of QMutexLocker, destroy it only at end of scopeSergio Martins2016-01-122-2/+2
| * | winrt: Fix playback of filesMaurice Kalinowski2016-01-181-2/+7
| * | Windows: fix build with -opengl desktop.Yoann Lopes2016-01-181-3/+4
| * | winrt: Fix crash in debug modeMaurice Kalinowski2016-01-181-0/+8
| * | Fix tst_QVideoWidget.Yoann Lopes2016-01-181-61/+42
* | | Updated license headersAntti Kokko2016-01-20138-2330/+2349
* | | Updated license headersAntti Kokko2016-01-19885-12364/+18834
* | | Updated license headersAntti Kokko2016-01-19122-2072/+4146
* | | Merge remote-tracking branch 'origin/5.6' into devChristian Strømme2016-01-15149-2022/+5156
|\ \ \ | |/ /
| * | winrt: add capabilities to launch app out of the boxMaurice Kalinowski2016-01-131-0/+3
| * | Windows: Improve EVR presenter.Yoann Lopes2016-01-1211-663/+716
| * | DirectShow: use the EVR in the renderer control.Yoann Lopes2016-01-1219-401/+705
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Christian Strømme2016-01-122-2/+9
| |\ \ | | |/
| | * Android: Don't call restartViewfinder() for audio only recordings.Christian Strømme2016-01-111-2/+7
| | * Fix playing sound in loop if sample size is smallPasi Petäjäjärvi2016-01-071-0/+2
| * | Doc: Generate separate listing of Widgets classes in the QHPTopi Reinio2016-01-121-3/+9
| * | Doc: Fix documentation warningsTopi Reinio2016-01-0819-72/+65
| * | Android: Media player improvments.Christian Strømme2016-01-081-27/+39
| * | Android: Improve detection of optimal settings for QAudioOutput.Christian Strømme2016-01-085-9/+184
| * | Android: Call release() in AndroidMediaMetadataRetriever's destructor.Christian Strømme2016-01-073-3/+2
| * | Android: Make the meta-data reader asyncChristian Strømme2016-01-073-91/+128
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-0716-158/+245
| |\ \ | | |/
| | * AVFoundation: correctly set the activeFormat on the AVCaptureDevice.Yoann Lopes2015-12-107-38/+62
| | * QNX: Handling looping properlyRoger Maclean2015-12-031-0/+3
| | * AVFoundation: fix setting up the video capture session.Yoann Lopes2015-12-031-1/+1
| | * AVFoundation: fix setting the camera viewfinder resolution.Yoann Lopes2015-12-033-1/+10
| | * Android: check for exceptions in some camera operations.Yoann Lopes2015-12-034-2/+61
| | * alsa: Relax ALSA version checks for 1.1.x to be detected.Raphael Kubo da Costa2015-11-274-9/+9
| | * AVFoundation: improve viewfinder settings.Yoann Lopes2015-11-202-110/+102