summaryrefslogtreecommitdiffstats
path: root/src/multimedia/camera
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-101-0/+6
|\
| * Suppress the -Wfloat-equal warningThiago Macieira2017-01-261-0/+6
* | Add missing override and remove redundant virtualAlexander Volkov2016-12-124-23/+23
|/
* Add proper global headers for QtMultimediaLars Knoll2016-11-231-1/+1
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-041-6/+4
|\
| * Add missing Q_DECL_CONSTEXPRChristian Strømme2016-11-011-6/+4
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-301-0/+3
|\|
| * QCameraPrivate: NULL-fill fields to be set up by init().Edward Welbourne2016-06-031-0/+3
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-073-10/+10
|\|
| * Add explicit and make public headers compile with -Wzero-as-null-pointer-cons...Marc Mutz2016-03-033-10/+10
* | Updated license headersAntti Kokko2016-01-1915-210/+300
* | Camera: replace foreach with range-based forAnton Kudryavtsev2016-01-152-15/+15
* | Add camera brightness adjustment API.Denis Shienkov2015-11-232-0/+22
|/
* Fix QCamera::lockStatus() documentation.Yoann Lopes2015-08-241-1/+1
* Fix QCamera viewfinder capabilities functions..Yoann Lopes2015-08-182-3/+5
* Fix qdoc warnings.Yoann Lopes2015-08-113-1/+26
* QCameraViewFinderSettings: add missing includev5.5.0-rc1v5.5.0Marc Mutz2015-06-141-0/+1
* QCameraViewFinderSettings: make op== transitiveMarc Mutz2015-06-121-2/+2
* QCameraViewFinderSettings: declare sharedMarc Mutz2015-06-121-0/+7
* QCameraViewFinderSettings: make op== non-memberMarc Mutz2015-06-122-16/+22
* QCameraViewFinderSettings: use correct includeMarc Mutz2015-06-121-1/+2
* Define QCamera::FrameRateRange as a struct.Yoann Lopes2015-06-112-7/+43
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-131-6/+5
|\
| * Fix some typosSergio Ahumada2015-02-111-1/+1
| * Clarify documentation for QImageCapture's 'ready' property.Yoann Lopes2015-02-101-5/+4
* | Update copyright headersAntti Kokko2015-02-1215-105/+105
* | New camera viewfinder settings API.Yoann Lopes2015-01-136-3/+671
* | Add additional exposure modes to QCameraExposure.Andrew den Exter2014-11-282-0/+20
* | Add a color filter property to QCameraImageProcessing.Andrew den Exter2014-11-282-1/+79
* | Allow supported camera locks to change after initialization.Andrew den Exter2014-11-282-21/+15
|/
* Update license headers and add new license filesAntti Kokko2014-08-2413-244/+140
* Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.Yoann Lopes2014-05-305-58/+33
* Fix crash in QCameraInfo when no camera is available on the system.Yoann Lopes2014-03-171-1/+1
* New QCameraInfo class.Yoann Lopes2014-02-289-115/+700
* Normalize signal & slot signatures in connectionThiago Macieira2014-02-031-2/+2
* Use the backend to notify the QCamera state changes.Yoann Lopes2013-12-051-9/+1
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1910-20/+20
|\
| * Fix lupdate-Warning in qcamera.cpp.Friedemann Kleint2013-02-061-1/+1
| * Doc: Fixed random QDoc warningsVenugopal Shivashankar2013-01-154-9/+9
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-1010-10/+10
* | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-285-20/+0
|/
* Fix syncqt-warnings.Friedemann Kleint2012-11-195-20/+20
* Rename namespace QtMultimedia -> QMultimediaSze Howe Koh2012-11-064-9/+9
* Remove stale QT_MODULE() usage casesSergio Ahumada2012-10-255-10/+0
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2410-240/+240
* Rename availabilityError to availability.Michael Goddard2012-06-294-9/+9
* Rename a few controls.Michael Goddard2012-06-293-5/+5
* Fixing some doc errors for overviewAngus Cummings2012-06-081-1/+2
* Fixed typo in QCamera::Status documentationDmytro Poplavskiy2012-05-181-1/+1
* Very minor C++ doc changesAngus Cummings2012-05-164-14/+14