diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-03-12 17:25:54 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-16 05:38:11 +0100 |
| commit | 7c0b1da0edec1228657ab06ab3eb2e6c529b84bd (patch) | |
| tree | 6c9b0a327a9408ed37cc35382e6c2c056f42faf9 /src/imports/multimedia/multimedia.pro | |
| parent | 1a1ac6b884426e5e3ff3cad5f61f9a6b0635c6a0 (diff) | |
Merge the QDeclarativeMediaBase and QDeclarativeAudio classes.
Since there is only one subclass of base.
Next step is to clean up QDeclarativeAudio
Change-Id: Ibda8c3006efa165b58372a011121f04a39458562
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'src/imports/multimedia/multimedia.pro')
| -rw-r--r-- | src/imports/multimedia/multimedia.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index 59c985326..45c10fa75 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -12,7 +12,6 @@ LIBS += -lQtMultimediaQuick_p HEADERS += \ qdeclarativeaudio_p.h \ - qdeclarativemediabase_p.h \ qdeclarativemediametadata_p.h \ qdeclarativevideooutput_p.h \ qsgvideonode_i420.h \ @@ -34,7 +33,6 @@ HEADERS += \ SOURCES += \ multimedia.cpp \ qdeclarativeaudio.cpp \ - qdeclarativemediabase.cpp \ qdeclarativevideooutput.cpp \ qsgvideonode_i420.cpp \ qsgvideonode_rgb.cpp \ |