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

Merge branch 'radio' into 'master'

Browse Source 
Change-Id: I86243b496b9fb42f828a67343dc576baa2c21ca0
This commit is contained in:
Jonas Rabbe
2011-08-31 13:09:47 +10:00
parent 3bf236cc23 8e954ee246
commit 6781063df6
19 changed files with 1425 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/imports/multimedia/multimedia.cpp
View File

@@ -48,6 +48,7 @@
#include "qdeclarativemediametadata_p.h"
#include "qdeclarativeaudio_p.h"
#include "qdeclarativevideooutput_p.h"
#include "qdeclarativeradio_p.h"
#if 0
#include "qdeclarativecamera_p.h"
#include "qdeclarativecamerapreviewprovider_p.h"
@@ -69,6 +70,7 @@ public:
qmlRegisterType<QDeclarativeAudio>(uri, 4, 0, "Audio");
qmlRegisterType<QDeclarativeAudio>(uri, 4, 0, "MediaPlayer");
qmlRegisterType<QDeclarativeVideoOutput>(uri, 4, 0, "VideoOutput");
qmlRegisterType<QDeclarativeRadio>(uri, 4, 0, "Radio");
/* Disabled until ported to scenegraph */
#if 0
qmlRegisterType<QDeclarativeCamera>(uri, 4, 0, "Camera");