Updated declarative components to use the QML module

Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

15 files changed, 32 insertions, 30 deletions

diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 0c940d18d..62eb1d43c 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlcomponent.h>
 #include "qsoundeffect.h"
 
 #include "qdeclarativemediametadata_p.h"
@@ -63,7 +63,7 @@ QML_DECLARE_TYPE(QSoundEffect)
 
 QT_BEGIN_NAMESPACE
 
-class QMultimediaDeclarativeModule : public QDeclarativeExtensionPlugin
+class QMultimediaDeclarativeModule : public QQmlExtensionPlugin
 {
     Q_OBJECT
 public:
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro
index 34386cc7a..59c985326 100644
--- a/src/imports/multimedia/multimedia.pro
+++ b/src/imports/multimedia/multimedia.pro
@@ -3,7 +3,7 @@ TARGETPATH = QtMultimedia
 
 include(../qimportbase.pri)
 
-QT += declarative quick network multimedia-private
+QT += qml quick network multimedia-private
 
 DESTDIR = $$QT.multimedia.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h
index 6d2497fac..fdbadbc4d 100644
--- a/src/imports/multimedia/qdeclarativeaudio_p.h
+++ b/src/imports/multimedia/qdeclarativeaudio_p.h
@@ -54,8 +54,8 @@
 //
 
 #include <QtCore/qbasictimer.h>
-#include <QtDeclarative/qdeclarativeparserstatus.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqmlparserstatus.h>
+#include <QtQml/qqml.h>
 
 #include "qdeclarativemediabase_p.h"
 
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 
 class QTimerEvent;
 
-class QDeclarativeAudio : public QObject, public QDeclarativeMediaBase, public QDeclarativeParserStatus
+class QDeclarativeAudio : public QObject, public QDeclarativeMediaBase, public QQmlParserStatus
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
@@ -93,7 +93,7 @@ class QDeclarativeAudio : public QObject, public QDeclarativeMediaBase, public Q
     Q_ENUMS(Loop)
     Q_ENUMS(PlaybackState)
     Q_ENUMS(Availability)
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
 public:
     enum Status
     {
diff --git a/src/imports/multimedia/qdeclarativeaudio_p_4.h b/src/imports/multimedia/qdeclarativeaudio_p_4.h
index 02c873df0..e79a5733e 100644
--- a/src/imports/multimedia/qdeclarativeaudio_p_4.h
+++ b/src/imports/multimedia/qdeclarativeaudio_p_4.h
@@ -54,8 +54,8 @@
 //
 
 #include <QtCore/qbasictimer.h>
-#include <QtDeclarative/qdeclarativeparserstatus.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqmlparserstatus.h>
+#include <QtQml/qqml.h>
 
 #include "qdeclarativemediabase_p_4.h"
 
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 
 class QTimerEvent;
 
-class QDeclarativeAudio_4 : public QObject, public QDeclarativeMediaBase_4, public QDeclarativeParserStatus
+class QDeclarativeAudio_4 : public QObject, public QDeclarativeMediaBase_4, public QQmlParserStatus
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
@@ -90,7 +90,7 @@ class QDeclarativeAudio_4 : public QObject, public QDeclarativeMediaBase_4, publ
     Q_ENUMS(Status)
     Q_ENUMS(Error)
     Q_ENUMS(Loop)
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
 public:
     enum Status
     {
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index 60aae9145..03bfede0b 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -50,7 +50,7 @@
 #include <qmediaplayercontrol.h>
 #include <qmediaservice.h>
 #include <qvideorenderercontrol.h>
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 
 #include <QtCore/QTimer>
 #include <QtGui/qevent.h>
diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h
index 8ac99574b..396ce80e0 100644
--- a/src/imports/multimedia/qdeclarativecamera_p.h
+++ b/src/imports/multimedia/qdeclarativecamera_p.h
@@ -62,8 +62,8 @@
 
 #include <QtCore/qbasictimer.h>
 #include <QtCore/qdatetime.h>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativeparserstatus.h>
+#include <QtQml/qqmlparserstatus.h>
+#include <QtQml/qqml.h>
 
 QT_BEGIN_HEADER
 
@@ -74,10 +74,10 @@ class QDeclarativeCameraFocus;
 class QDeclarativeCameraFlash;
 class QDeclarativeCameraImageProcessing;
 
-class QDeclarativeCamera : public QObject, public QDeclarativeParserStatus
+class QDeclarativeCamera : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
 
     Q_PROPERTY(CaptureMode captureMode READ captureMode WRITE setCaptureMode NOTIFY captureModeChanged)
     Q_PROPERTY(State cameraState READ cameraState WRITE setCameraState NOTIFY cameraStateChanged)
diff --git a/src/imports/multimedia/qdeclarativecameracapture_p.h b/src/imports/multimedia/qdeclarativecameracapture_p.h
index 3d80965e9..93bf5d2c1 100644
--- a/src/imports/multimedia/qdeclarativecameracapture_p.h
+++ b/src/imports/multimedia/qdeclarativecameracapture_p.h
@@ -57,7 +57,7 @@
 #include <qcameraimagecapture.h>
 #include <qmediaencodersettings.h>
 
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
index 912b9d711..40f4a634d 100644
--- a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
+++ b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
@@ -53,13 +53,13 @@
 // We mean it.
 //
 
-#include <QtDeclarative/qdeclarativeimageprovider.h>
+#include <QtQml/qqmlimageprovider.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeCameraPreviewProvider : public QDeclarativeImageProvider
+class QDeclarativeCameraPreviewProvider : public QQmlImageProvider
 {
 public:
     QDeclarativeCameraPreviewProvider();
diff --git a/src/imports/multimedia/qdeclarativemediabase.cpp b/src/imports/multimedia/qdeclarativemediabase.cpp
index 934464c22..2ec9cc1af 100644
--- a/src/imports/multimedia/qdeclarativemediabase.cpp
+++ b/src/imports/multimedia/qdeclarativemediabase.cpp
@@ -43,7 +43,7 @@
 
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qurl.h>
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 
 #include <qmediaplayercontrol.h>
 #include <qmediaservice.h>
diff --git a/src/imports/multimedia/qdeclarativemediabase_4.cpp b/src/imports/multimedia/qdeclarativemediabase_4.cpp
index dee5c0c45..9466f6724 100644
--- a/src/imports/multimedia/qdeclarativemediabase_4.cpp
+++ b/src/imports/multimedia/qdeclarativemediabase_4.cpp
@@ -43,7 +43,7 @@
 
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qurl.h>
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 
 #include <qmediaplayercontrol.h>
 #include <qmediaservice.h>
diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h
index d84eeca61..77e076f3b 100644
--- a/src/imports/multimedia/qdeclarativemediametadata_p.h
+++ b/src/imports/multimedia/qdeclarativemediametadata_p.h
@@ -55,7 +55,7 @@
 
 #include <qmetadatareadercontrol.h>
 
-#include <qdeclarative.h>
+#include <QtQml/qqml.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp
index ff4bbb3fb..aed3d40a8 100644
--- a/src/imports/multimedia/qdeclarativeradio.cpp
+++ b/src/imports/multimedia/qdeclarativeradio.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qdeclarativeradio_p.h"
+#include "qdeclarativeradiodata_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/multimedia/qdeclarativeradio_p.h b/src/imports/multimedia/qdeclarativeradio_p.h
index 5424b162d..3829c84e2 100644
--- a/src/imports/multimedia/qdeclarativeradio_p.h
+++ b/src/imports/multimedia/qdeclarativeradio_p.h
@@ -53,14 +53,15 @@
 // We mean it.
 //
 
-#include <QtDeclarative/qdeclarative.h>
 #include <qradiotuner.h>
-#include "qdeclarativeradiodata_p.h"
+#include <QtQml/qqml.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+class QDeclarativeRadioData;
+
 class QDeclarativeRadio : public QObject
 {
     Q_OBJECT
diff --git a/src/imports/multimedia/qdeclarativeradiodata_p.h b/src/imports/multimedia/qdeclarativeradiodata_p.h
index b9fb553cb..ce157e7b0 100644
--- a/src/imports/multimedia/qdeclarativeradiodata_p.h
+++ b/src/imports/multimedia/qdeclarativeradiodata_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include <QtDeclarative/qdeclarative.h>
 #include <qradiodata.h>
 #include <qradiotuner.h>
+#include <QtQml/qqml.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/imports/multimedia/qdeclarativetorch_p.h b/src/imports/multimedia/qdeclarativetorch_p.h
index 5dd21f7e9..05a637e3a 100644
--- a/src/imports/multimedia/qdeclarativetorch_p.h
+++ b/src/imports/multimedia/qdeclarativetorch_p.h
@@ -43,8 +43,8 @@
 #ifndef QDECLARATIVETORCH_P_H
 #define QDECLARATIVETORCH_P_H
 
-#include <QObject>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtCore/QObject>
+#include <QtQml/qqml.h>
 #include <qcamera.h>
 #include <qcameraexposurecontrol.h>
 #include <qcameraflashcontrol.h>