diff options
| author | Alexander Akulich <akulichalexander@gmail.com> | 2020-02-07 18:30:27 +0300 |
|---|---|---|
| committer | Alexander Akulich <akulichalexander@gmail.com> | 2020-03-03 16:14:48 +0300 |
| commit | 19477de84a64f412bca9ce2df62ab9adb3859da2 (patch) | |
| tree | d676ff20a447c750988ff2cbd4af205f2e54b094 /src/imports | |
| parent | 07f073c0e059d5565651f27376a504974a59c6a2 (diff) | |
QCamera: Deprecate 'error' signal, use 'errorOccurred' instead
[ChangeLog][Deprecation Notice] QCamera::error() (the signal) is deprecated; superseded by errorOccurred()
Change-Id: Ie3214689db7f46cf36ac696339ac42beb5b921d4
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 4 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera_p.h | 2 |
2 files changed, 3 insertions, 3 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: |