diff options
-rw-r--r-- | src/imports/multimedia/plugins.qmltypes | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeaudio_p.h | 4 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera_p.h | 3 |
4 files changed, 0 insertions, 11 deletions
diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes index 92cf6834d..1f43a4a64 100644 --- a/src/imports/multimedia/plugins.qmltypes +++ b/src/imports/multimedia/plugins.qmltypes @@ -479,7 +479,6 @@ Module { isReadonly: true isPointer: true } - Property { name: "mediaSource"; type: "QObject"; isReadonly: true; isPointer: true } Property { name: "availability"; type: "Availability"; isReadonly: true } Property { name: "audioRole"; revision: 1; type: "AudioRole" } Property { name: "customAudioRole"; revision: 3; type: "string" } @@ -627,7 +626,6 @@ Module { Property { name: "maximumOpticalZoom"; type: "double"; isReadonly: true } Property { name: "digitalZoom"; type: "double" } Property { name: "maximumDigitalZoom"; type: "double"; isReadonly: true } - Property { name: "mediaSource"; type: "QObject"; isReadonly: true; isPointer: true } Property { name: "imageCapture" type: "QDeclarativeCameraCapture" diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index c52cc3717..268d9070b 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -875,8 +875,6 @@ void QDeclarativeAudio::classBegin() connect(m_player, SIGNAL(metaDataChanged()), m_metaData.data(), SIGNAL(metaDataChanged())); - - emit mediaSourceChanged(); } void QDeclarativeAudio::componentComplete() diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h index e85105d44..5f5944768 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p.h +++ b/src/imports/multimedia/qdeclarativeaudio_p.h @@ -86,7 +86,6 @@ class QDeclarativeAudio : public QObject, public QQmlParserStatus Q_PROPERTY(Error error READ error NOTIFY errorChanged) Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) Q_PROPERTY(QDeclarativeMediaMetaData *metaData READ metaData CONSTANT) - Q_PROPERTY(QObject *mediaSource READ mediaSource NOTIFY mediaSourceChanged SCRIPTABLE false DESIGNABLE false) Q_PROPERTY(AudioRole audioRole READ audioRole WRITE setAudioRole NOTIFY audioRoleChanged REVISION 1) Q_PROPERTY(QString customAudioRole READ customAudioRole WRITE setCustomAudioRole NOTIFY customAudioRoleChanged REVISION 3) Q_PROPERTY(int notifyInterval READ notifyInterval WRITE setNotifyInterval NOTIFY notifyIntervalChanged REVISION 2) @@ -164,8 +163,6 @@ public: void classBegin() override; void componentComplete() override; - QObject *mediaSource() { return m_player; } - bool isAvailable() const; AudioRole audioRole() const; @@ -249,7 +246,6 @@ Q_SIGNALS: void errorChanged(); void error(QDeclarativeAudio::Error error, const QString &errorString); - void mediaSourceChanged(); Q_REVISION(2) void notifyIntervalChanged(); Q_REVISION(15) void videoOutputChanged(); diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index 8ee7b4753..ebe7b4d2a 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -90,7 +90,6 @@ class QDeclarativeCamera : public QObject, public QQmlParserStatus Q_PROPERTY(qreal minimumZoomFactor READ minimumZoomFactor) Q_PROPERTY(qreal maximumZoomFactor READ maximumZoomFactor) Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged) - Q_PROPERTY(QObject *mediaSource READ mediaSource CONSTANT); Q_PROPERTY(QDeclarativeCameraCapture* imageCapture READ imageCapture CONSTANT) Q_PROPERTY(QDeclarativeCameraRecorder* videoRecorder READ videoRecorder CONSTANT) @@ -179,8 +178,6 @@ public: QDeclarativeCamera(QObject *parent = 0); ~QDeclarativeCamera(); - QObject *mediaSource() { return m_camera; } - QDeclarativeCameraCapture *imageCapture() { return m_imageCapture; } QDeclarativeCameraRecorder *videoRecorder() { return m_videoRecorder; } QDeclarativeCameraExposure *exposure() { return m_exposure; } |