diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 4 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera_p.h | 2 | ||||
-rw-r--r-- | src/multimedia/camera/qcamera.cpp | 11 | ||||
-rw-r--r-- | src/multimedia/camera/qcamera.h | 3 |
4 files changed, 16 insertions, 4 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 7730c9900..379a6f39e 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE -void QDeclarativeCamera::_q_error(QCamera::Error errorCode) +void QDeclarativeCamera::_q_errorOccurred(QCamera::Error errorCode) { emit error(Error(errorCode), errorString()); emit errorChanged(); @@ -197,7 +197,7 @@ QDeclarativeCamera::QDeclarativeCamera(QObject *parent) : this, SIGNAL(lockStatusChanged())); connect(m_camera, &QCamera::stateChanged, this, &QDeclarativeCamera::_q_updateState); connect(m_camera, SIGNAL(statusChanged(QCamera::Status)), this, SIGNAL(cameraStatusChanged())); - connect(m_camera, SIGNAL(error(QCamera::Error)), this, SLOT(_q_error(QCamera::Error))); + connect(m_camera, SIGNAL(errorOccurred(QCamera::Error)), this, SLOT(_q_errorOccurred(QCamera::Error))); connect(m_camera, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus))); diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index 97afa5b53..b22b9d059 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -332,7 +332,7 @@ Q_SIGNALS: private Q_SLOTS: void _q_updateState(QCamera::State); - void _q_error(QCamera::Error); + void _q_errorOccurred(QCamera::Error); void _q_availabilityChanged(QMultimedia::AvailabilityStatus); protected: diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 40441f332..79412b961 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -109,6 +109,7 @@ void QCameraPrivate::_q_error(int error, const QString &errorString) this->error = QCamera::Error(error); this->errorString = errorString; + emit q->errorOccurred(this->error); emit q->error(this->error); } @@ -823,7 +824,7 @@ void QCamera::setCaptureMode(QCamera::CaptureModes mode) Starts the camera. State is changed to QCamera::ActiveState if camera is started - successfully, otherwise error() signal is emitted. + successfully, otherwise errorOccurred() signal is emitted. While the camera state is changed to QCamera::ActiveState, starting the camera service can be asynchronous with the actual @@ -1271,6 +1272,14 @@ void QCamera::unlock() /*! \fn void QCamera::error(QCamera::Error value) + \obsolete + + Use errorOccurred() instead. +*/ + +/*! + \fn void QCamera::errorOccurred(QCamera::Error value) + \since 5.15 Signal emitted when error state changes to \a value. */ diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index b2582cd19..97cf4509b 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -242,7 +242,10 @@ Q_SIGNALS: void lockStatusChanged(QCamera::LockStatus status, QCamera::LockChangeReason reason); void lockStatusChanged(QCamera::LockType lock, QCamera::LockStatus status, QCamera::LockChangeReason reason); +#if QT_DEPRECATED_SINCE(5,15) void error(QCamera::Error); +#endif + void errorOccurred(QCamera::Error); private: Q_DISABLE_COPY(QCamera) |