diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-19 15:31:25 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-19 15:31:25 +0200 |
| commit | 78dcac759d500c1744751955623b1d0babcd37a4 (patch) | |
| tree | 59d7a2540c2fcffe0b274afbf85db9a1f53242f4 /src/multimedia/video/video.pri | |
| parent | f1c79b3c90c1e14d8bee0228e3e416fa5337cf6e (diff) | |
| parent | de0858687898f6e0e54cce3f986779c7aa1a350e (diff) | |
| download | qt4-tools-78dcac759d500c1744751955623b1d0babcd37a4.tar.gz | |
Merge remote branch 'origin/4.7' into HEAD
Conflicts:
src/corelib/tools/qlocale_symbian.cpp
Diffstat (limited to 'src/multimedia/video/video.pri')
| -rw-r--r-- | src/multimedia/video/video.pri | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/multimedia/video/video.pri b/src/multimedia/video/video.pri new file mode 100644 index 0000000000..0547a4c3e1 --- /dev/null +++ b/src/multimedia/video/video.pri @@ -0,0 +1,21 @@ + +INCLUDEPATH += $$PWD + +HEADERS += \ + $$PWD/qabstractvideobuffer.h \ + $$PWD/qabstractvideobuffer_p.h \ + $$PWD/qabstractvideosurface.h \ + $$PWD/qabstractvideosurface_p.h \ + $$PWD/qimagevideobuffer_p.h \ + $$PWD/qmemoryvideobuffer_p.h \ + $$PWD/qvideoframe.h \ + $$PWD/qvideosurfaceformat.h + +SOURCES += \ + $$PWD/qabstractvideobuffer.cpp \ + $$PWD/qabstractvideosurface.cpp \ + $$PWD/qimagevideobuffer.cpp \ + $$PWD/qmemoryvideobuffer.cpp \ + $$PWD/qvideoframe.cpp \ + $$PWD/qvideosurfaceformat.cpp + |