summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/qsgvideonode_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Properly handle the case where QtWidgets is not available.Michael Goddard2012-01-061-1/+1
| | | | | | | | | | | | | | | It does use a config test for now, just to make it clearer. The Mac backend currently requires widgets, but most of the others should work without it (just not supporting QVideoWidget/WindowControl). The QVideoDeviceControl interface was modified to remove the QIcon usage - it was never implemented. Unfortunately even the QML examples need widgets for the wrapper application, and will need to be ported to QtGui based wrapper. Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-061-1/+1
| | | | | Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtMultimedia: Fix compiler warnings.Friedemann Kleint2012-01-051-1/+1
| | | | | | | | | | | - Fix deprecated QDeclarative includes. - Comment out unused parameter. - Remove trailing comma from enumeration value (Clang) Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Change-Id: I31d54a12505f4e3a48eb4b7736a48d5dacc2c0d9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove the module prefix from a number of includes.Michael Goddard2011-12-091-1/+1
| | | | | | | Since I get build failures due to other changes in lower modules. Change-Id: Iac6a814071c019de25db52daf941185337fad14a Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QtMultimedia: Fix warnings about declarative/quick.Friedemann Kleint2011-12-051-1/+1
| | | | | Change-Id: Ic9323b222641e41dae05cb4b0dccb6531e845676 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Add orientation support to VideoOutput.Michael Goddard2011-11-251-1/+2
| | | | | | | | | Just uses an integer to represent the degrees rotation from standard. Only supports multiples of 90 - other rotation can be done with standard QML. Change-Id: Id4013169c5d9da473b6e5be94ba341da21c2f2a3 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@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>
* Initial implementation of QML2 VideoOutput elementDmytro Poplavskiy2011-08-111-0/+72
Change-Id: I5ed00433fe5e993086ae1698b7344c8d60a5f0f6 Reviewed-on: http://codereview.qt.nokia.com/2727 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>