summaryrefslogtreecommitdiffstats
path: root/src/multimedia/camera
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-211-1/+1
|\
| * Fix building with namespaced QtChristian Stenger2019-09-111-1/+1
* | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-123-4/+4
|\|
| * Include moc files after QT_END_NAMESPACEVal Doroshchuk2019-09-093-4/+4
* | Make QMediaObjectPrivate as QObjectPrivateVaL Doroshchuk2019-08-234-14/+10
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-301-1/+1
|\|
| * Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-07-231-1/+1
| |\
| | * Camera: Update the doc about supported viewfinder settingsVaL Doroshchuk2019-07-161-1/+1
| | * Fix QCameraInfo to be invalid if camera failed to find deviceVaL Doroshchuk2019-03-251-2/+10
* | | Fix API of QCameraExposure, QCameraFocus, QCameraImageProcessing for Qt for P...Friedemann Kleint2019-07-043-3/+9
|/ /
* | Fix QCameraInfo to be invalid if camera failed to find deviceVal Doroshchuk2019-01-181-2/+10
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-111-24/+19
|\|
| * Return ServiceMissingError if no camera found by nameVaL Doroshchuk2019-01-071-24/+19
* | multimedia: modernize by using nullptrJochen Seemann2019-01-046-61/+61
|/
* Doc: Fix documentation warningsTopi Reinio2018-04-195-18/+19
* Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1Liang Qi2018-02-181-1/+1
|\
| * fix typo in QCameraImageProcessing documentationJochen Seemann2018-02-051-1/+1
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-273-10/+10
* | Use qFuzzyCompare() instead of equality on floating-point valuesEdward Welbourne2017-03-221-1/+4
|/
* 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