diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-04 06:24:25 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-04 06:24:25 (GMT) |
| commit | 49e7e1dccf38a8cf1aad88de037e590f7918b7ea (patch) | |
| tree | bc59a4d347d3f724341d559cb7bdef6d25e627a5 /src/imports/multimedia/multimedia.pro | |
| parent | 57d68b06c15f8426c25e357f97b9154056969e0f (diff) | |
| parent | 2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4 (diff) | |
| download | Qt-49e7e1dccf38a8cf1aad88de037e590f7918b7ea.zip Qt-49e7e1dccf38a8cf1aad88de037e590f7918b7ea.tar.gz Qt-49e7e1dccf38a8cf1aad88de037e590f7918b7ea.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
src/src.pro
Diffstat (limited to 'src/imports/multimedia/multimedia.pro')
| -rw-r--r-- | src/imports/multimedia/multimedia.pro | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index ad2ce1b..117aa9b 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -4,7 +4,18 @@ include(../qimportbase.pri) QT += multimedia declarative -SOURCES += multimedia.cpp +HEADERS += \ + qdeclarativeaudio_p.h \ + qdeclarativemediabase_p.h \ + qdeclarativevideo_p.h \ + qmetadatacontrolmetaobject_p.h \ + +SOURCES += \ + multimedia.cpp \ + qdeclarativeaudio.cpp \ + qdeclarativemediabase.cpp \ + qdeclarativevideo.cpp \ + qmetadatacontrolmetaobject.cpp QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/Qt/multimedia target.path = $$TARGETPATH |