diff options
| author | Jonas Rabbe <jonas.rabbe@nokia.com> | 2011-08-31 13:09:47 +1000 |
|---|---|---|
| committer | Jonas Rabbe <jonas.rabbe@nokia.com> | 2011-08-31 13:09:47 +1000 |
| commit | 6781063df647fcba3dd5ca6fdff8631579acb495 (patch) | |
| tree | f505a6cadb9e8edd341b0105f47e051a6a597b5c /src/imports/multimedia/multimedia.cpp | |
| parent | 3bf236cc23c2e67e1b5cbc01e05e61263528fc10 (diff) | |
| parent | 8e954ee2462e827e88bbc27b1512d1e1422357fc (diff) | |
| download | qtmultimedia-6781063df647fcba3dd5ca6fdff8631579acb495.tar.gz | |
Merge branch 'radio' into 'master'
Change-Id: I86243b496b9fb42f828a67343dc576baa2c21ca0
Diffstat (limited to 'src/imports/multimedia/multimedia.cpp')
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 18684d578..7c684253b 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -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"); |