diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-08-30 14:42:21 +1000 |
|---|---|---|
| committer | Michael Goddard <michael.goddard@nokia.com> | 2011-08-30 15:34:30 +1000 |
| commit | 3bf236cc23c2e67e1b5cbc01e05e61263528fc10 (patch) | |
| tree | b6b547e7863a929a2638528cddfd52c0fff6f8d9 /src/imports/multimedia/multimedia.pro | |
| parent | 4ddffcdae313bf494ac12d098743af341add77e3 (diff) | |
| parent | 47a5dd4371bfc6774790cc900e287f5def12406a (diff) | |
Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakit
Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b
Diffstat (limited to 'src/imports/multimedia/multimedia.pro')
| -rw-r--r-- | src/imports/multimedia/multimedia.pro | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index 845fe9b96..1a2e757a9 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -12,11 +12,20 @@ HEADERS += \ qdeclarativeaudio_p.h \ qdeclarativemediabase_p.h \ qdeclarativemediametadata_p.h \ + qdeclarativevideooutput_p.h \ + qsgvideonode_p.h \ + qsgvideonode_i420.h \ + qsgvideonode_rgb32.h \ + SOURCES += \ multimedia.cpp \ qdeclarativeaudio.cpp \ qdeclarativemediabase.cpp \ + qdeclarativevideooutput.cpp \ + qsgvideonode.cpp \ + qsgvideonode_i420.cpp \ + qsgvideonode_rgb32.cpp \ disabled { HEADERS += \ |