Merge branch 'radio' into 'master'

Change-Id: I86243b496b9fb42f828a67343dc576baa2c21ca0

diff --cc src/imports/multimedia/multimedia.cpp
index 18684d5,9b34dcf..7c68425
--- 1/src/imports/multimedia/multimedia.cpp
--- 2/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@@ -47,8 -47,9 +47,9 @@@
  
  #include "qdeclarativemediametadata_p.h"
  #include "qdeclarativeaudio_p.h"
 +#include "qdeclarativevideooutput_p.h"
+ #include "qdeclarativeradio_p.h"
  #if 0
 -#include "qdeclarativevideo_p.h"
  #include "qdeclarativecamera_p.h"
  #include "qdeclarativecamerapreviewprovider_p.h"
  #endif
@@@ -67,10 -68,10 +68,11 @@@ public
  
          qmlRegisterType<QSoundEffect>(uri, 4, 0, "SoundEffect");
          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<QDeclarativeVideo>(uri, 4, 0, "Video");
          qmlRegisterType<QDeclarativeCamera>(uri, 4, 0, "Camera");
  #endif
          qmlRegisterType<QDeclarativeMediaMetaData>();

diff --cc src/imports/multimedia/multimedia.pro
index 1a2e757,aed7cda..75ca764
--- 1/src/imports/multimedia/multimedia.pro
--- 2/src/imports/multimedia/multimedia.pro
+++ b/src/imports/multimedia/multimedia.pro
@@@ -12,20 -12,13 +12,21 @@@ HEADERS += 
          qdeclarativeaudio_p.h \
          qdeclarativemediabase_p.h \
          qdeclarativemediametadata_p.h \
- 
 +        qdeclarativevideooutput_p.h \
 +        qsgvideonode_p.h \
 +        qsgvideonode_i420.h \
 +        qsgvideonode_rgb32.h \
+         qdeclarativeradio_p.h
  
  SOURCES += \
          multimedia.cpp \
          qdeclarativeaudio.cpp \
          qdeclarativemediabase.cpp \
 +        qdeclarativevideooutput.cpp \
 +        qsgvideonode.cpp \
 +        qsgvideonode_i420.cpp \
 +        qsgvideonode_rgb32.cpp \
+         qdeclarativeradio.cpp
  
  disabled {
      HEADERS += \