From 8e82f57c6ac2db6754bfcd6828accb2fcfb77891 Mon Sep 17 00:00:00 2001 From: Jonas Rabbe Date: Wed, 14 Mar 2012 08:39:43 +1000 Subject: [PATCH] Updated declarative components to use the QML module Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515 Reviewed-by: Jonas Rabbe --- examples/declarative-radio/declarative-radio.pro | 5 ++++- src/imports/audioengine/audioengine.cpp | 10 +++++----- src/imports/audioengine/audioengine.pro | 2 +- .../audioengine/qdeclarative_attenuationmodel_p.h | 8 ++++---- .../audioengine/qdeclarative_audiocategory_p.h | 8 ++++---- .../audioengine/qdeclarative_audioengine_p.cpp | 2 +- src/imports/audioengine/qdeclarative_audioengine_p.h | 12 ++++++------ src/imports/audioengine/qdeclarative_audiosample_p.h | 8 ++++---- .../audioengine/qdeclarative_playvariation_p.h | 8 ++++---- src/imports/audioengine/qdeclarative_sound_p.h | 4 ++-- src/imports/multimedia/multimedia.cpp | 10 +++++----- src/imports/multimedia/multimedia.pro | 2 +- src/imports/multimedia/qdeclarativeaudio_p.h | 8 ++++---- src/imports/multimedia/qdeclarativeaudio_p_4.h | 8 ++++---- src/imports/multimedia/qdeclarativecamera.cpp | 2 +- src/imports/multimedia/qdeclarativecamera_p.h | 8 ++++---- src/imports/multimedia/qdeclarativecameracapture_p.h | 2 +- .../multimedia/qdeclarativecamerapreviewprovider_p.h | 4 ++-- src/imports/multimedia/qdeclarativemediabase.cpp | 2 +- src/imports/multimedia/qdeclarativemediabase_4.cpp | 2 +- src/imports/multimedia/qdeclarativemediametadata_p.h | 2 +- src/imports/multimedia/qdeclarativeradio.cpp | 1 + src/imports/multimedia/qdeclarativeradio_p.h | 5 +++-- src/imports/multimedia/qdeclarativeradiodata_p.h | 2 +- src/imports/multimedia/qdeclarativetorch_p.h | 4 ++-- .../qdeclarativevideooutput.pro | 2 +- .../tst_qdeclarativevideooutput.cpp | 4 ++-- tests/auto/unit/multimedia.pro | 5 +++++ .../unit/qdeclarativeaudio/qdeclarativeaudio.pro | 2 +- .../unit/qdeclarativeaudio_4/qdeclarativeaudio_4.pro | 2 +- .../unit/qdeclarativevideo/qdeclarativevideo.pro | 2 +- 31 files changed, 78 insertions(+), 68 deletions(-) diff --git a/examples/declarative-radio/declarative-radio.pro b/examples/declarative-radio/declarative-radio.pro index 74834276..75b70d2e 100644 --- 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 + diff --git a/src/imports/audioengine/audioengine.cpp b/src/imports/audioengine/audioengine.cpp index 495a11a4..0536847a 100644 --- a/src/imports/audioengine/audioengine.cpp +++ b/src/imports/audioengine/audioengine.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include -#include -#include -#include +#include +#include +#include +#include #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: diff --git a/src/imports/audioengine/audioengine.pro b/src/imports/audioengine/audioengine.pro index d3cc2baf..72c7ae84 100644 --- 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 diff --git a/src/imports/audioengine/qdeclarative_attenuationmodel_p.h b/src/imports/audioengine/qdeclarative_attenuationmodel_p.h index 57b96fec..ad6ae0b0 100644 --- 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 -#include +#include +#include #include 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: diff --git a/src/imports/audioengine/qdeclarative_audiocategory_p.h b/src/imports/audioengine/qdeclarative_audiocategory_p.h index fa8eb514..48ae7c5b 100644 --- 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 -#include +#include +#include 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) diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.cpp b/src/imports/audioengine/qdeclarative_audioengine_p.cpp index 7c025a55..659cf655 100644 --- 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 +#include #include "qdebug.h" #define DEBUG_AUDIOENGINE diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.h b/src/imports/audioengine/qdeclarative_audioengine_p.h index 4b1364d8..527426a7 100644 --- 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 -#include -#include +#include +#include +#include #include #include #include @@ -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 bank READ bank CONSTANT) + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(QQmlListProperty 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) diff --git a/src/imports/audioengine/qdeclarative_audiosample_p.h b/src/imports/audioengine/qdeclarative_audiosample_p.h index d854efd3..91fbec00 100644 --- 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 -#include +#include +#include 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) diff --git a/src/imports/audioengine/qdeclarative_playvariation_p.h b/src/imports/audioengine/qdeclarative_playvariation_p.h index 1438aa5b..cd38e88b 100644 --- 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 -#include +#include +#include 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) diff --git a/src/imports/audioengine/qdeclarative_sound_p.h b/src/imports/audioengine/qdeclarative_sound_p.h index 9784b04f..7184af97 100644 --- 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 -#include +#include +#include #include #include "qdeclarative_playvariation_p.h" diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 0c940d18..62eb1d43 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include -#include -#include -#include +#include +#include +#include +#include #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 34386cc7..59c98532 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 6d2497fa..fdbadbc4 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p.h +++ b/src/imports/multimedia/qdeclarativeaudio_p.h @@ -54,8 +54,8 @@ // #include -#include -#include +#include +#include #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 02c873df..e79a5733 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p_4.h +++ b/src/imports/multimedia/qdeclarativeaudio_p_4.h @@ -54,8 +54,8 @@ // #include -#include -#include +#include +#include #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 60aae914..03bfede0 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index 8ac99574..396ce80e 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -62,8 +62,8 @@ #include #include -#include -#include +#include +#include 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 3d80965e..93bf5d2c 100644 --- a/src/imports/multimedia/qdeclarativecameracapture_p.h +++ b/src/imports/multimedia/qdeclarativecameracapture_p.h @@ -57,7 +57,7 @@ #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h index 912b9d71..40f4a634 100644 --- a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h +++ b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h @@ -53,13 +53,13 @@ // We mean it. // -#include +#include 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 934464c2..2ec9cc1a 100644 --- a/src/imports/multimedia/qdeclarativemediabase.cpp +++ b/src/imports/multimedia/qdeclarativemediabase.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/src/imports/multimedia/qdeclarativemediabase_4.cpp b/src/imports/multimedia/qdeclarativemediabase_4.cpp index dee5c0c4..9466f672 100644 --- a/src/imports/multimedia/qdeclarativemediabase_4.cpp +++ b/src/imports/multimedia/qdeclarativemediabase_4.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h index d84eeca6..77e076f3 100644 --- a/src/imports/multimedia/qdeclarativemediametadata_p.h +++ b/src/imports/multimedia/qdeclarativemediametadata_p.h @@ -55,7 +55,7 @@ #include -#include +#include QT_BEGIN_HEADER diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp index ff4bbb3f..aed3d40a 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 5424b162..3829c84e 100644 --- a/src/imports/multimedia/qdeclarativeradio_p.h +++ b/src/imports/multimedia/qdeclarativeradio_p.h @@ -53,14 +53,15 @@ // We mean it. // -#include #include -#include "qdeclarativeradiodata_p.h" +#include 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 b9fb553c..ce157e7b 100644 --- a/src/imports/multimedia/qdeclarativeradiodata_p.h +++ b/src/imports/multimedia/qdeclarativeradiodata_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include #include #include +#include QT_BEGIN_HEADER diff --git a/src/imports/multimedia/qdeclarativetorch_p.h b/src/imports/multimedia/qdeclarativetorch_p.h index 5dd21f7e..05a637e3 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 -#include +#include +#include #include #include #include diff --git a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro index 140eecb7..5d93a9e8 100644 --- 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 += \ diff --git a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp index b4bc8572..6f542dbb 100644 --- a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp +++ b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp @@ -43,8 +43,8 @@ #include -#include -#include +#include +#include #include "qdeclarativevideooutput_p.h" diff --git a/tests/auto/unit/multimedia.pro b/tests/auto/unit/multimedia.pro index 3fa3f982..a0851681 100644 --- a/tests/auto/unit/multimedia.pro +++ b/tests/auto/unit/multimedia.pro @@ -33,3 +33,8 @@ SUBDIRS += \ qdeclarativeaudio \ qdeclarativeaudio_4 \ qaudiodecoder + +disabled { + SUBDIRS += \ + qdeclarativevideo +} diff --git a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro index 35f11735..6f1fb0c8 100644 --- 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 += \ diff --git a/tests/auto/unit/qdeclarativeaudio_4/qdeclarativeaudio_4.pro b/tests/auto/unit/qdeclarativeaudio_4/qdeclarativeaudio_4.pro index 0822a738..d045ba03 100644 --- 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 += \ diff --git a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro index cd1c615c..2dfa64c0 100644 --- 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 += \