summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* whitespace fixesOswald Buddenhagen2014-01-3054-160/+160
* Android: fix crash in QAndroidCaptureSession.Yoann Lopes2014-01-291-1/+3
* Fix MSVC-warning about truncation of constant in tst_qaudiobuffer.cpp.Friedemann Kleint2014-01-291-1/+1
* Fix MSVC-warnings about unsafe bool operations in tst_qcamera.cpp.Friedemann Kleint2014-01-291-1/+2
* Fix MSVC-warnings about unused variable meta in tst_qdeclarativevideooutput.cpp.Friedemann Kleint2014-01-291-4/+2
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-1735-114/+289
|\
| * Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
| * Fix build without Qml and Quick modules.Yoann Lopes2014-01-164-8/+17
| * Fix build error on BlackBerry10Wolfgang Bremer2014-01-161-2/+2
| * Use QStringRef instead of QString whenever possible.Jędrzej Nowacki2014-01-1511-23/+23
| * Only acquire resources as required in gstreamer backend.Andrew den Exter2014-01-1312-25/+107
| * Fix playback with exotic gstreamer pipelines.Andrew den Exter2014-01-131-1/+7
| * Fix recording settings being discarded by the Camera QML type.Andrew den Exter2014-01-132-0/+11
| * Fix configuration of camera settings in camerabin backend.Andrew den Exter2014-01-133-5/+44
| * Allow the camerabin source selection to be overridden.Andrew den Exter2014-01-135-50/+80
| * don't error out on static buildsOswald Buddenhagen2014-01-101-2/+0
* | BlackBerry: Changed documentationBernd Weimer2014-01-132-2/+2
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-1020-24/+267
|\|
| * BlackBerry: Fixed volume settingBernd Weimer2014-01-101-1/+1
| * Mark tst_qcamerabackend test as insignificant on Mac OS XSimon Hausmann2014-01-081-0/+2
| * Android: QVideoProbe support for cameraDenis Kormalev2014-01-089-11/+248
| * Fix some typos in documentation.Jeff Tranter2014-01-076-8/+8
| * Fixed some documentation for VideoOutput qml type.Yoann Lopes2014-01-061-2/+2
| * PulseAudio: fix crash when failing to create a context.Yoann Lopes2014-01-061-2/+3
| * GStreamer: add missing breaks in QGstreamerRecorderControl.Yoann Lopes2014-01-061-0/+3
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/stagi...Frederik Gladhorn2014-01-071-1/+1
|\ \
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-061-1/+1
| |\|
| | * Correct QSoundEffect::supportedMimeTypes() documentation.Mitch Curtis2014-01-021-1/+1
* | | Fix whitespace issue in the QVideoFrame auto test.Christian Strømme2014-01-071-1/+1
|/ /
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-235-163/+687
|\|
| * Android: camera moved to a dedicated threadDenis Kormalev2013-12-235-163/+687
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-1612-398/+166
|\|
| * Android: fix camera previewDenis Kormalev2013-12-115-43/+91
| * WMF: remove dead code.Yoann Lopes2013-12-111-333/+0
| * WMF: fix some crashes.Yoann Lopes2013-12-113-5/+10
| * Android: automatically deploy playlist plugins.Yoann Lopes2013-12-101-1/+2
| * Android add support for qrc in mediaplayer.Christian Strømme2013-12-092-3/+14
| * Use the backend to notify the QCamera state changes.Yoann Lopes2013-12-051-9/+1
| * Android: fix camera viewfinder orientation.Yoann Lopes2013-12-054-6/+50
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-0510-50/+144
|\|
| * WMF: fixed various media player issues.Yoann Lopes2013-12-041-13/+18
| * Revert "WMF: fixed MediaPlayer buffering logic."Yoann Lopes2013-12-041-13/+3
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-036-12/+108
| |\
| | * QNX/PPS: Fix end-of-track handlingv5.2.0Frank Osterfeld2013-11-301-2/+2
| | * Add changes-5.2.0 file.Yoann Lopes2013-11-301-0/+86
| | * Fix version availability for VideoOutput's autoOrientation property.Yoann Lopes2013-11-303-3/+3
| | * Android: print a warning when using SurfaceTexture on Android 2.3.Yoann Lopes2013-11-301-7/+17
| * | Android: Add missing 'L' prefix and ';' postfix in areaToRect()Christian Strømme2013-12-031-1/+1
| * | OpenSL: Fix volume scaleChristian Strømme2013-12-021-1/+3
| * | CoreAudio: fix supported input and output channel count.Yoann Lopes2013-12-021-12/+13