diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2011-08-25 14:05:10 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-12 03:27:29 +0200 |
| commit | 1913f164dcb59b31d9a7be93311390410437eabb (patch) | |
| tree | 8b572e21ceb60475e0fffd2fb6f4178620524b49 /src/imports/multimedia/multimedia.pro | |
| parent | 47a5dd4371bfc6774790cc900e287f5def12406a (diff) | |
QML Camera element redesign.
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>
Diffstat (limited to 'src/imports/multimedia/multimedia.pro')
| -rw-r--r-- | src/imports/multimedia/multimedia.pro | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index 1a2e757a9..c300e9846 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -16,6 +16,14 @@ HEADERS += \ qsgvideonode_p.h \ qsgvideonode_i420.h \ qsgvideonode_rgb32.h \ + qdeclarativecamera_p.h \ + qdeclarativecameracapture_p.h \ + qdeclarativecamerarecorder_p.h \ + qdeclarativecameraexposure_p.h \ + qdeclarativecameraflash_p.h \ + qdeclarativecamerafocus_p.h \ + qdeclarativecameraimageprocessing_p.h \ + qdeclarativecamerapreviewprovider_p.h SOURCES += \ @@ -26,17 +34,23 @@ SOURCES += \ qsgvideonode.cpp \ qsgvideonode_i420.cpp \ qsgvideonode_rgb32.cpp \ + qdeclarativecamera.cpp \ + qdeclarativecameracapture.cpp \ + qdeclarativecamerarecorder.cpp \ + qdeclarativecameraexposure.cpp \ + qdeclarativecameraflash.cpp \ + qdeclarativecamerafocus.cpp \ + qdeclarativecameraimageprocessing.cpp \ + qdeclarativecamerapreviewprovider.cpp disabled { HEADERS += \ qdeclarativevideo_p.h \ - qdeclarativecamera_p.h \ - qdeclarativecamerapreviewprovider_p.h + SOURCES += \ qdeclarativevideo.cpp \ - qdeclarativecamera.cpp \ - qdeclarativecamerapreviewprovider.cpp + } qmldir.files += $$PWD/qmldir |