summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-244-17/+3
|\
| * DirectShow: Remove unused class and member in DSCameraServiceChristian Strømme2016-11-231-2/+0
| * WMF: Fix copy-and-paste errorChristian Strømme2016-11-171-1/+1
| * Fix plugin class name when using neutrino serviceJanne Koskinen2016-11-081-1/+2
| * remove dependencies from sync.profileOswald Buddenhagen2016-11-051-13/+0
* | Merge remote-tracking branch 'origin/5.7.1' into 5.7Liang Qi2016-11-243-8/+42
|\ \
| * | Add changes file for 5.7.1v5.7.1Yoann Lopes2016-10-261-0/+34
| * | Merge 5.7 into 5.7.1Oswald Buddenhagen2016-10-0620-125/+197
| |\ \
| * | | Pass the context to QtAndroidMediaPlayerBogDan Vatra2016-09-282-8/+8
* | | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-0432-74/+271
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | iOS: add Info.plist to declarative-camera exampleRichard Moe Gustavsen2016-11-022-0/+43
| * | iOS: add NSCameraUsageDescription to Info.plist for qmlvideofxRichard Moe Gustavsen2016-11-021-0/+2
| * | WMF: make it possible to build only the audio decode serviceYoann Lopes2016-11-0214-15/+27
| * | Blacklist tst_QAudioDecoderBackend on WindowsYoann Lopes2016-11-021-0/+2
| * | WindowsAudio: fix volume when using multiple QAudioOutputsYoann Lopes2016-11-021-13/+10
| * | Add missing Q_DECL_CONSTEXPRChristian Strømme2016-11-011-6/+4
| * | Mark AndroidCameraInfo as movableChristian Strømme2016-11-011-0/+1
| * | Change PLUGIN_DISABLE_MMAP to PLUGIN_MMAPJames McDonnell2016-10-312-2/+2
| * | Android: emit mediaStatus changes before state changesYoann Lopes2016-10-281-3/+3
| * | Improve playlist tests in tst_QMediaPlayerBackendYoann Lopes2016-10-281-2/+154
| * | Blacklist all media player integration tests on OpenSuseYoann Lopes2016-10-281-14/+1
| * | WMF: fix incorrect pointer dereferenceYoann Lopes2016-10-211-1/+1
| * | Reduce size of QMediaPlayerPrivateChristian Stromme2016-10-191-10/+10
| * | Increase margin of error in tst_QMediaObject::notifySignals()Yoann Lopes2016-10-181-1/+1
| * | Doc: Add a \brief for the QMediaMetaData namespaceLeena Miettinen2016-10-071-1/+1
| * | Blacklist testSetSourceWhileLoading on all Linux distrosMaurice Kalinowski2016-10-061-0/+3
| * | GStreamer: emit mediaStatus changes before state changesYoann Lopes2016-10-061-6/+6
* | | Doc: added definition for parameter gainNico Vertriest2016-10-051-1/+3
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-0410-70/+79
|\| |
| * | Blacklist testSetSourceWhilePlaying() in 5.6Milla Pohjanheimo2016-09-291-0/+3
| * | Doc: Add comment about stream requirementsChristian Strømme2016-09-281-2/+2
| * | Remove useless castChristian Strømme2016-09-281-1/+1
| * | Clamp out-of-range volume values in QAudioInput and QAudioOutputYoann Lopes2016-09-282-2/+4
| * | Clamp volume in QMediaRecorder and QSoundEffectYoann Lopes2016-09-272-6/+4
| * | AVFoundation: fix metadata controlYoann Lopes2016-09-272-53/+59
| * | Stabilize pushSuspendResume() autotestMilla Pohjanheimo2016-09-271-2/+2
| * | Stabilize tst_QAudioOutput::pull() and push() autotestsMilla Pohjanheimo2016-09-231-4/+4
* | | Doc: corrected reference to parameter "end"Nico Vertriest2016-10-041-1/+1
* | | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Yoann Lopes2016-09-227-49/+110
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7Yoann Lopes2016-09-227-49/+110
| |\| | | | |/ | |/|
| | * Stabilize tst_QAudioOutput::pullSuspendResume()Yoann Lopes2016-09-212-10/+2
| | * GStreamer: print a warning when the camerabin plugin is missingYoann Lopes2016-09-211-1/+12
| | * PulseAudio: make code more robustYoann Lopes2016-09-212-31/+95
| | * Make tst_QMediaObject::notifySignals() less flakyYoann Lopes2016-09-201-3/+8
| | * Don't try to compile Vivante video node plugin without OpenGL ESYoann Lopes2016-09-201-1/+1
| | * Remove unnecessary import statement in QML snippetYoann Lopes2016-09-201-3/+0
* | | Fix QML module version in documentationYoann Lopes2016-09-223-4/+4
|/ /
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-176-9/+33282
|\|
| * Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-161-0/+90
| |\
| | * Add changes file for 5.6.2v5.6.2Yoann Lopes2016-09-121-0/+90