diff options
| author | Alexander Akulich <akulichalexander@gmail.com> | 2020-02-07 19:00:17 +0300 |
|---|---|---|
| committer | Alexander Akulich <akulichalexander@gmail.com> | 2020-03-10 22:57:54 +0300 |
| commit | 6a7d1bd6acbe7bfa9bdab8c5d2e96216bc73ce69 (patch) | |
| tree | 3b5a56b2105950b1bc6a1b55491a272ef97732c6 | |
| parent | 31d1f6f64d19991b80211e11c46fed5c0697d3b5 (diff) | |
Deprecate Camera::error() signal in favor of errorOccurred()v5.15.0-beta2
[ChangeLog][Deprecation Notice] Camera::error() signal is deprecated in favor of errorOccurred().
Change-Id: Id80a3c72eec0529ef2f1e293e0afb503202a6d38
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 13 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera_p.h | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 379a6f39e..3a9bc8fa2 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -62,6 +62,7 @@ QT_BEGIN_NAMESPACE void QDeclarativeCamera::_q_errorOccurred(QCamera::Error errorCode) { emit error(Error(errorCode), errorString()); + emit errorOccurred(Error(errorCode), errorString()); emit errorChanged(); } @@ -420,7 +421,7 @@ QDeclarativeCamera::Error QDeclarativeCamera::errorCode() const This property holds the last error string, if any. - \sa error, errorCode + \sa errorOccurred, errorCode */ QString QDeclarativeCamera::errorString() const { @@ -752,11 +753,19 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) \value Camera.NotSupportedFeatureError The feature is not supported. - \sa error, errorString + \sa errorOccurred, errorString */ /*! \qmlsignal QtMultimedia::Camera::error(errorCode, errorString) + \obsolete + + Use errorOccurred() instead. +*/ + +/*! + \qmlsignal QtMultimedia::Camera::errorOccurred(errorCode, errorString) + \since 5.15 This signal is emitted when an error specified by \a errorCode occurs. A descriptive string value is available in \a errorString. diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index b22b9d059..41203ac80 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -308,7 +308,10 @@ public Q_SLOTS: Q_SIGNALS: void errorChanged(); +#if QT_DEPRECATED_SINCE(5,15) void error(QDeclarativeCamera::Error errorCode, const QString &errorString); +#endif + Q_REVISION(15) void errorOccurred(QDeclarativeCamera::Error errorCode, const QString &errorString); Q_REVISION(1) void deviceIdChanged(); Q_REVISION(1) void positionChanged(); |