summaryrefslogtreecommitdiffstats
path: root/examples/declarative-camera
Commit message (Collapse)AuthorAgeFilesLines
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3011-11/+11
| | | | | | | | | | 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-2311-11/+11
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update year in Nokia copyright headers.Jason McDonald2012-01-1211-11/+11
| | | | | | | 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-1110-16/+16
| | | | | | | | | | | | 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-077-9/+9
| | | | | | | | | | 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>
* Compile with refactorGunnar Sletta2011-09-172-2/+3
| | | | | | | Change-Id: I248f811a13ca00ccbf5d342a556d389bca625856 Reviewed-on: http://codereview.qt-project.org/4940 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Dropped Incandescent white balance mode.Dmytro Poplavskiy2011-08-251-2/+2
| | | | | | | | | It's the same as Tungsten, was inittialy added by mistake. Change-Id: Idf1d7be2f8d0969bba3480a8702034b7cabfdaef Reviewed-on: http://codereview.qt.nokia.com/3563 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove most of the "mobility" references.Michael Goddard2011-07-1911-11/+11
| | | | | | | | | Docs still need some fixing, but there are some legitimate usages of it there. Change-Id: I94c7b68788ce97829711a4384884d7e52fe84162 Reviewed-on: http://codereview.qt.nokia.com/1736 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Remove a few more obsolete parts.Michael Goddard2011-07-195-216/+5
| | | | | | | Change-Id: I3a001f01ab7fd8cf63452126037b98c1b01df80d Reviewed-on: http://codereview.qt.nokia.com/1797 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fixed build breakJ-P Nurmi2011-07-142-2/+2
| | | | | | | | | | | QDeclarativeItem and QDeclarativeView was moved from QtDeclarative to QtQuick1, also added qtquick1 module to the .pro file for the declarative camera example. Change-Id: Iae0828871d94d5f424b5329664303e2c0b9539bf Reviewed-on: http://codereview.qt.nokia.com/1559 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed up examples and demosJonas Rabbe2011-07-061-8/+7
| | | | | | | | | | | | Changed the .pro files and moved some things around to ensure that the examples and demos for Qt Multimedia Kit compiles and can be checked by the CI system. Change-Id: I915dc38ca76a97f20949df715725659c603231e2 Reviewed-on: http://codereview.qt.nokia.com/1136 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Initial copy of QtMultimediaKit.Michael Goddard2011-06-2929-0/+1480
Comes from original repo, with SHA1: 2c82d5611655e5967f5c5095af50c0991c4378b2