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 /tests/auto/unit/qdeclarativeaudio | |
| 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 'tests/auto/unit/qdeclarativeaudio')
| -rw-r--r-- | tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro index 6f1fb0c8d..0584cba43 100644 --- a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro +++ b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro @@ -6,12 +6,10 @@ CONFIG += no_private_qt_headers_warning HEADERS += \ $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio_p.h \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase_p.h \ $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediametadata_p.h SOURCES += \ tst_qdeclarativeaudio.cpp \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio.cpp \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase.cpp + $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio.cpp INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia |