Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I0f0457e9863f540b7bd8bc104c92891d8cf5c483
This commit is contained in:
Frederik Gladhorn
2013-04-29 14:19:29 +02:00
19 changed files with 147 additions and 128 deletions

View File

@@ -1,7 +1,5 @@
QT += qml quick network multimedia-private qtmultimediaquicktools-private
LIBS += -L$$QT.multimedia.libs
HEADERS += \
qdeclarativeaudio_p.h \
qdeclarativemediametadata_p.h \