summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/qdeclarativecamera.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Rename namespace QtMultimedia -> QMultimediaSze Howe Koh2012-11-061-2/+2
| | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Mass find+replace "QtMultimedia::" -> "QMultimedia::" 2. Hand-modified declaration in qtmedianamespace.h/cpp For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-241-24/+24
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Added an index page and separated \qmlproperty and \property documentationVenugopal Shivashankar2012-08-291-41/+60
| | | | | | Change-Id: I29bcfd0a31c781deb4cce2d6bcb2afca32191ae6 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com> Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-271-1/+2
| | | | | | | | | -New qdoc command \qmltype replaces \qmlclass -\instantiates <C++ class> for determining if the QML type has a C++ implementation Change-Id: I83d1e2c3f376f96ea51afedadf88c3cf478e33d8 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Rename availabilityError to availability.Michael Goddard2012-06-291-6/+4
| | | | | | | It's perhaps clearer in the usual case. Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Fix a number of other qdoc issues.Michael Goddard2012-06-151-14/+7
| | | | | | | | | | | | | | * Several places needed the forward class declaration hack * Missing/wrong minor version numbers on imports * A few typos * Any number of attempts to work around qdoc * A few missing docs * Tweaked soundeffect docs Change-Id: I3c2ab998a11cbb0956712e0423e01fdb70f5bfff Reviewed-by: Peter Yard <peter.yard@nokia.com> Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Updating brief layout of QML typesAngus Cummings2012-06-141-1/+1
| | | | | | Change-Id: I1dcd7bf7427f25bb9e19cbe3c7e17808b0fc9708 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
* Added missing QDeclarativeCamera::CaptureViewfinder enum valueDmytro Poplavskiy2012-05-181-0/+3
| | | | | Change-Id: I75844e3a943a76649d1b51f0c845a4bf8b200a8e Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Expose camera status to QML Camera elementDmytro Poplavskiy2012-05-161-0/+58
| | | | | | | | It's exposed as Camera.cameraStatus property. Change-Id: Id3b477266d3a666b7a2a61cd4579f0e3f873d3b8 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Minor doc fixes for QMLAngus Cummings2012-05-161-21/+14
| | | | | | | | | | renaming QML element to QML type removing some \fn tags that were making the docs not build some rewording some new signal docs Change-Id: I9b350dad1780276959aef4105e53b91082a6083e Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fixed QML Camera errors reportingDmytro Poplavskiy2012-05-141-5/+23
| | | | | | | | Added missing connection to QCamera::error() signal Added Camera.errorCode property Change-Id: Ie0dd71d760b4b5b79b2aefaba97bc383ef2a9750 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Don't use QtDeclarative compat moduleKent Hansen2012-05-141-1/+1
| | | | | | | Use QtQml instead. Change-Id: I7618ba89a2ed288f7043ae402ac091a924598f03 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fix a number of doc errors and warnings.Michael Goddard2012-04-111-18/+24
| | | | | | | | | | | * Document a few missing classes/functions/methods * Fix a number of QML snippets that wouldn't work as standalone snippets * Add files to .pro so they show up in Creator.. Still the mysterious lack of controls dir documentation persists :/ Change-Id: I57162371a4d966e4db5bdb1b71d1baf9c0ca57c3 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Updated a lot of minor fixes to the docs and removed warnings from qdocJonas Rabbe2012-04-051-2/+7
| | | | | Change-Id: Ib7fd75fb93c038f9e8fa9d71b6ad01fb27b97622 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Updated declarative components to use the QML moduleJonas Rabbe2012-03-141-1/+1
| | | | | Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Expose availability from the backend to C++ and QML.Michael Goddard2012-03-021-0/+37
| | | | | | | | | | | | | | The availabilityError property was static based on the service, but it can change at run time, so add the plumbing to allow the backend to report it itself. Also make sure that both QML and C++ expose the availability. The radio tuner and data controls previously had properties (but no signals) for availability - these have been removed. Change-Id: I9240cf93e2a51b14cd38642f9312ae3c75f05361 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-021-46/+46
| | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: Iec1c616e0d9a915a31a661916805916e19495dc9 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Docs: fix qml links and standalone build for MultimediaPeter Yard2012-02-221-13/+15
| | | | | Change-Id: Ia3f1e49aef203911bb5cf1ee062c9100be213b38 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Tweak some more documentation.Michael Goddard2012-02-141-142/+80
| | | | | | | | | | | A lot of the previous Qt Mobility API methods were still present, so they are gone now. Also removed some of the C++ documentation since it's not public API anyway. Made a group for camera QML APIs and used that for the list in the camera overview documentation. Change-Id: I0864bd2230a42596e951b68d0df1211766c90dfc Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Documentation updates for declarative camera elements.Michael Goddard2012-02-131-1/+15
| | | | | | | A number of things were missing. Change-Id: Ic4eb2e88804b519478eeae733cc5f473b717270d Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Removed QFlags from declarative camera properties.Dmytro Poplavskiy2012-02-061-3/+3
| | | | | | | | | It doesn't work, while even without QFlags camera.captureMode = Camera.CaptureVideo + Camera.CaptureStillImage works correctly. Change-Id: I00727ad37cbf33e0c6d557a9da08160d6ea4bdc9 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I20e5215108c6ebd5f8474fed5c3665118e4791e6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* More minor doc fixes.Michael Goddard2012-01-171-1/+2
| | | | | | | | | | - Missing enums - Misspelt \fn etc - Missing QSoundEffect C++ docs - A few typos etc Change-Id: I3418e79b5d50a7ab86e54d79676c33d06954bef5 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix up a few doc issuesMichael Goddard2012-01-171-1/+2
| | | | | | | | | | | | | * lingering references to Mobility * missing group tags on some classes meant they went missing * put classes into functional groups as well (e.g. audio, camera) * added some of the qdoc files to OTHER_FILES so they show up in Creator There are still a lot of warnings since it seems like qdoc is not processing the controls directory. Change-Id: I036f8826ae63f8273b3e649cb32c091d964ce830 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Changed QCamera::captureMode property to QFlagsDmytro Poplavskiy2012-01-171-5/+5
| | | | | | | | | This enables the expression of extra camera modes like viewfinder only or capture during video recording. Change-Id: Ie02fdeef5eb7fd6fc2f133c1afb0141e37c22b06 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Remove antiquated \since lines in docs.Michael Goddard2012-01-161-1/+0
| | | | | | | They aren't useful in the case of QtMultimedia{Kit} Change-Id: If1b0b6625763c85907fb05beb9c440046472ddef Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Update year in Nokia copyright headers.Jason McDonald2012-01-121-1/+1
| | | | | | | Update headers from before 2011 that were missed in the previous commit. Change-Id: Ib0fd91a39ffc57117fe01280e34519c3f914fac0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated QtMultimedia declarative module to version 5.0Jonas Rabbe2012-01-111-3/+3
| | | | | | | | | | | | The QtMultimedia module should have version 5.0 to align with Qt 5 in general. This change updates the version, but keeps 4.0 versions of the elements for compatability purposes. Documentation and examples has also been updated to reflect this version change. Change-Id: Ica10c1a5ecc2c7233192a65e04ff77eb33a77e30 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Rename QtMultimediaKit to QtMultimedia.Michael Goddard2011-10-071-2/+2
| | | | | | | | | | There are a few legacy bits left in place so it passes CI, and then qt5.git etc can be updated. Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a Reviewed-on: http://codereview.qt-project.org/5368 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* QML Camera element redesign.Dmytro Poplavskiy2011-09-121-821/+69
| | | | | | | | | | Grouped camera properties in a similar way to C++ QCamera API. Added support for video recording. Change-Id: I8667dc90878b3e20eda5523ba562f5687bd0932b Reviewed-on: http://codereview.qt-project.org/3552 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Remove some obsolete bits.Michael Goddard2011-07-181-10/+0
| | | | | | | | | They can be updated again later when things are more stable, if needed. Change-Id: I73bdacdd3d1fd43a60cd3a0c14b925fa9c32ee27 Reviewed-on: http://codereview.qt.nokia.com/1724 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Update licenseheader text in source files for qtmultimediakit Qt moduleJyri Tahtela2011-07-081-17/+17
| | | | | | | | Replace old license header with correct one. Change-Id: Ibff8fbea6595bb80f1122d55db2194accd319308 Reviewed-on: http://codereview.qt.nokia.com/1318 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Initial copy of QtMultimediaKit.Michael Goddard2011-06-291-0/+1342
Comes from original repo, with SHA1: 2c82d5611655e5967f5c5095af50c0991c4378b2
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 00:42:43 +0000