slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge the QDeclarativeMediaBase and QDeclarativeAudio classes.

Browse Source 
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>
This commit is contained in:
Michael Goddard
2012-03-12 17:25:54 +10:00
committed by Qt by Nokia
parent 1a1ac6b884
commit 7c0b1da0ed
6 changed files with 558 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
View File

@@ -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