diff options
author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2020-05-31 20:52:51 +0200 |
---|---|---|
committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2020-06-04 10:23:10 +0200 |
commit | 99cf6a4aed9c48287c46b05cdb4507c0637dd2e1 (patch) | |
tree | 571bb8bc0f70d25e7c20a603e87df9dc5f8b1953 /src/multimedia | |
parent | 9c16be3d9d956f612dda431f4883eab3b09a8b67 (diff) |
Remove QT_DEPRECATED API
Change-Id: I2aa2334f7408164bf288d82b28e4e6aff9a2503b
Fixes: QTBUG-84593
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/multimedia')
-rw-r--r-- | src/multimedia/camera/qcamera.cpp | 25 | ||||
-rw-r--r-- | src/multimedia/camera/qcamera.h | 8 |
2 files changed, 0 insertions, 33 deletions
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 79412b961..b4515cfad 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -110,7 +110,6 @@ void QCameraPrivate::_q_error(int error, const QString &errorString) this->errorString = errorString; emit q->errorOccurred(this->error); - emit q->error(this->error); } void QCameraPrivate::setState(QCamera::State newState) @@ -879,30 +878,6 @@ void QCamera::unload() d->setState(QCamera::UnloadedState); } -#if QT_DEPRECATED_SINCE(5, 3) -/*! - Returns a list of camera device's available from the default service provider. - \deprecated - \sa QCameraInfo::availableCameras() -*/ - -QList<QByteArray> QCamera::availableDevices() -{ - return QMediaServiceProvider::defaultServiceProvider()->devices(QByteArray(Q_MEDIASERVICE_CAMERA)); -} - -/*! - Returns the description of the \a device. - \deprecated - \sa QCameraInfo::availableCameras(), QCameraInfo::description() -*/ - -QString QCamera::deviceDescription(const QByteArray &device) -{ - return QMediaServiceProvider::defaultServiceProvider()->deviceDescription(QByteArray(Q_MEDIASERVICE_CAMERA), device); -} -#endif - QCamera::State QCamera::state() const { return d_func()->state; diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index 97cf4509b..d088e9beb 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -171,11 +171,6 @@ public: explicit QCamera(QCamera::Position position, QObject *parent = nullptr); ~QCamera(); -#if QT_DEPRECATED_SINCE(5, 3) - QT_DEPRECATED static QList<QByteArray> availableDevices(); - QT_DEPRECATED static QString deviceDescription(const QByteArray &device); -#endif - QMultimedia::AvailabilityStatus availability() const override; State state() const; @@ -242,9 +237,6 @@ 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: |