Merge branch 'radio' into 'master'

Change-Id: I86243b496b9fb42f828a67343dc576baa2c21ca0
2011-08-31 13:09:47 +10:00
parent 3bf236cc23 8e954ee246
commit 6781063df6
19 changed files with 1425 additions and 5 deletions
--- a/src/imports/multimedia/multimedia.pro
+++ b/src/imports/multimedia/multimedia.pro
@@ -16,7 +16,7 @@ HEADERS += \
        qsgvideonode_p.h \
        qsgvideonode_i420.h \
        qsgvideonode_rgb32.h \
-
+        qdeclarativeradio_p.h

 SOURCES += \
        multimedia.cpp \
@@ -26,6 +26,7 @@ SOURCES += \
        qsgvideonode.cpp \
        qsgvideonode_i420.cpp \
        qsgvideonode_rgb32.cpp \
+        qdeclarativeradio.cpp

 disabled {
    HEADERS += \