Updated declarative components to use the QML module

Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-03-14 08:39:43 +10:00
parent 8d63785425
commit 8e82f57c6a
31 changed files with 78 additions and 68 deletions
--- a/examples/declarative-radio/declarative-radio.pro
+++ b/examples/declarative-radio/declarative-radio.pro
@@ -1,4 +1,7 @@
-QT += declarative quick multimedia
+QT += qml quick multimedia

 SOURCES += main.cpp
 RESOURCES += declarative-radio.qrc
+
+OTHER_FILES += view.qml
+
--- a/src/imports/audioengine/audioengine.cpp
+++ b/src/imports/audioengine/audioengine.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 "qdeclarative_audioengine_p.h"
 #include "qdeclarative_soundinstance_p.h"
@@ -55,7 +55,7 @@

 QT_BEGIN_NAMESPACE

-class QAudioEngineDeclarativeModule : public QDeclarativeExtensionPlugin
+class QAudioEngineDeclarativeModule : public QQmlExtensionPlugin
 {
    Q_OBJECT
 public:
--- a/src/imports/audioengine/audioengine.pro
+++ b/src/imports/audioengine/audioengine.pro
@@ -2,7 +2,7 @@ TARGET  = declarative_audioengine
 TARGETPATH = QtAudioEngine

 include(../qimportbase.pri)
-QT += declarative quick multimedia-private
+QT += quick qml multimedia-private

 win32 {
    LIBS += -lOpenAL32
--- a/src/imports/audioengine/qdeclarative_attenuationmodel_p.h
+++ b/src/imports/audioengine/qdeclarative_attenuationmodel_p.h
@@ -42,18 +42,18 @@
 #ifndef QDECLARATIVEATTENUATIONMODEL_P_H
 #define QDECLARATIVEATTENUATIONMODEL_P_H

-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlcomponent.h>
 #include <QVector3D>

 QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-class QDeclarativeAttenuationModel : public QObject, public QDeclarativeParserStatus
+class QDeclarativeAttenuationModel : public QObject, public QQmlParserStatus
 {
    Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
    Q_PROPERTY(QString name READ name WRITE setName)

 public:
--- a/src/imports/audioengine/qdeclarative_audiocategory_p.h
+++ b/src/imports/audioengine/qdeclarative_audiocategory_p.h
@@ -42,17 +42,17 @@
 #ifndef QDECLARATIVEAUDIOCATEGORY_P_H
 #define QDECLARATIVEAUDIOCATEGORY_P_H

-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlcomponent.h>

 QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-class QDeclarativeAudioCategory : public QObject, public QDeclarativeParserStatus
+class QDeclarativeAudioCategory : public QObject, public QQmlParserStatus
 {
    Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
    Q_PROPERTY(qreal volume READ volume WRITE setVolume NOTIFY volumeChanged)
    Q_PROPERTY(QString name READ name WRITE setName)

--- a/src/imports/audioengine/qdeclarative_audioengine_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audioengine_p.cpp
@@ -48,7 +48,7 @@
 #include "qdeclarative_attenuationmodel_p.h"
 #include "qdeclarative_soundinstance_p.h"
 #include "qsoundinstance_p.h"
-#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtQml/qqmlengine.h>
 #include "qdebug.h"

 #define DEBUG_AUDIOENGINE
--- a/src/imports/audioengine/qdeclarative_audioengine_p.h
+++ b/src/imports/audioengine/qdeclarative_audioengine_p.h
@@ -42,9 +42,9 @@
 #ifndef QDECLARATIVEAUDIOENGINE_P_H
 #define QDECLARATIVEAUDIOENGINE_P_H

-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtDeclarative/qdeclarativepropertymap.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlcomponent.h>
+#include <QtQml/qqmlpropertymap.h>
 #include <QtCore/QMap>
 #include <QtCore/QList>
 #include <QTimer>
@@ -64,11 +64,11 @@ class QAudioCategory;
 class QDeclarativeAttenuationModel;
 class QSoundInstance;

-class QDeclarativeAudioEngine : public QObject, public QDeclarativeParserStatus
+class QDeclarativeAudioEngine : public QObject, public QQmlParserStatus
 {
    Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
-    Q_PROPERTY(QDeclarativeListProperty<QObject> bank READ bank CONSTANT)
+    Q_INTERFACES(QQmlParserStatus)
+    Q_PROPERTY(QQmlListProperty<QObject> bank READ bank CONSTANT)
    Q_PROPERTY(QObject* categories READ categories CONSTANT)
    Q_PROPERTY(QObject* samples READ samples CONSTANT)
    Q_PROPERTY(QObject* sounds READ sounds CONSTANT)
--- a/src/imports/audioengine/qdeclarative_audiosample_p.h
+++ b/src/imports/audioengine/qdeclarative_audiosample_p.h
@@ -42,8 +42,8 @@
 #ifndef QDECLARATIVEAUDIOSAMPLE_P_H
 #define QDECLARATIVEAUDIOSAMPLE_P_H

-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlcomponent.h>

 QT_BEGIN_HEADER

@@ -51,10 +51,10 @@ QT_BEGIN_NAMESPACE

 class QSoundBuffer;

-class QDeclarativeAudioSample : public QObject, public QDeclarativeParserStatus
+class QDeclarativeAudioSample : public QObject, public QQmlParserStatus
 {
    Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
    Q_PROPERTY(QString name READ name WRITE setName)
    Q_PROPERTY(QUrl source READ source WRITE setSource)
    Q_PROPERTY(bool preloaded READ isPreloaded WRITE setPreloaded)
--- a/src/imports/audioengine/qdeclarative_playvariation_p.h
+++ b/src/imports/audioengine/qdeclarative_playvariation_p.h
@@ -42,8 +42,8 @@
 #ifndef QDECLARATIVEPLAYVARIATION_P_H
 #define QDECLARATIVEPLAYVARIATION_P_H

-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlcomponent.h>

 QT_BEGIN_HEADER

@@ -52,10 +52,10 @@ QT_BEGIN_NAMESPACE
 class QDeclarativeAudioSample;
 class QSoundInstance;

-class QDeclarativePlayVariation : public QObject, public QDeclarativeParserStatus
+class QDeclarativePlayVariation : public QObject, public QQmlParserStatus
 {
    Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
    Q_PROPERTY(QString sample READ sample WRITE setSample)
    Q_PROPERTY(bool looping READ isLooping WRITE setLooping)
    Q_PROPERTY(qreal maxGain READ maxGain WRITE setMaxGain)
--- a/src/imports/audioengine/qdeclarative_sound_p.h
+++ b/src/imports/audioengine/qdeclarative_sound_p.h
@@ -42,8 +42,8 @@
 #ifndef QDECLARATIVESOUND_P_H
 #define QDECLARATIVESOUND_P_H

-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlcomponent.h>
 #include <QtCore/qlist.h>
 #include "qdeclarative_playvariation_p.h"

--- 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:
--- 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
--- 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
    {
--- 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
    {
--- 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>
--- 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)
--- 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

--- 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();
--- 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>
--- 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>
--- 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

--- 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

--- 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
--- 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

--- 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>
--- a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
+++ b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qdeclarativevideooutput

-QT += multimedia-private declarative testlib quick
+QT += multimedia-private qml testlib quick
 CONFIG += no_private_qt_headers_warning

 OTHER_FILES += \
--- a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
+++ b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
@@ -43,8 +43,8 @@

 #include <QtTest/QtTest>

-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlcomponent.h>

 #include "qdeclarativevideooutput_p.h"

--- a/tests/auto/unit/multimedia.pro
+++ b/tests/auto/unit/multimedia.pro
@@ -33,3 +33,8 @@ SUBDIRS += \
    qdeclarativeaudio \
    qdeclarativeaudio_4 \
    qaudiodecoder
+
+disabled {
+    SUBDIRS += \
+        qdeclarativevideo
+}
--- a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
+++ b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qdeclarativeaudio

-QT += multimedia-private declarative testlib
+QT += multimedia-private qml testlib
 CONFIG += no_private_qt_headers_warning

 HEADERS += \
--- a/tests/auto/unit/qdeclarativeaudio_4/qdeclarativeaudio_4.pro
+++ b/tests/auto/unit/qdeclarativeaudio_4/qdeclarativeaudio_4.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qdeclarativeaudio_4

-QT += multimedia-private declarative testlib
+QT += multimedia-private qml testlib
 CONFIG += no_private_qt_headers_warning

 HEADERS += \
--- a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro
+++ b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qdeclarativevideo

-QT += multimedia-private declarative testlib
+QT += multimedia-private qml testlib
 CONFIG += no_private_qt_headers_warning

 HEADERS += \