4 files changed, 0 insertions, 37 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index 3a9bc8fa2..c530fbe0b 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -61,7 +61,6 @@ QT_BEGIN_NAMESPACE
 
 void QDeclarativeCamera::_q_errorOccurred(QCamera::Error errorCode)
 {
-    emit error(Error(errorCode), errorString());
     emit errorOccurred(Error(errorCode), errorString());
     emit errorChanged();
 }
diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h
index 41203ac80..51bd5ddf9 100644
--- a/src/imports/multimedia/qdeclarativecamera_p.h
+++ b/src/imports/multimedia/qdeclarativecamera_p.h
@@ -308,9 +308,6 @@ 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();
diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp
index 61c22c066..d8fb62d9a 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus.cpp
+++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp
@@ -189,20 +189,6 @@ QVariantList QDeclarativeCameraFocus::supportedFocusModes() const
     return supportedModes;
 }
 
-#if QT_DEPRECATED_SINCE(5, 11)
-/*!
-    \qmlmethod bool QtMultimedia::CameraFocus::isFocusModeSupported(mode) const
-    \obsolete
-
-    Returns true if the supplied \a mode is a supported focus mode, and
-    false otherwise.
-*/
-bool QDeclarativeCameraFocus::isFocusModeSupported(QDeclarativeCameraFocus::FocusMode mode) const
-{
-    return m_focus->isFocusModeSupported(QCameraFocus::FocusModes(int(mode)));
-}
-#endif
-
 void QDeclarativeCameraFocus::setFocusMode(QDeclarativeCameraFocus::FocusMode mode)
 {
     if (mode != focusMode()) {
@@ -280,20 +266,6 @@ void QDeclarativeCameraFocus::setFocusPointMode(QDeclarativeCameraFocus::FocusPo
     }
 }
 
-#if QT_DEPRECATED_SINCE(5, 10)
-/*!
-    \qmlmethod bool QtMultimedia::CameraFocus::isFocusPointModeSupported(mode) const
-    \obsolete
-
-    Returns true if the supplied \a mode is a supported focus point mode, and
-    false otherwise.
-*/
-bool QDeclarativeCameraFocus::isFocusPointModeSupported(QDeclarativeCameraFocus::FocusPointMode mode) const
-{
-    return m_focus->isFocusPointModeSupported(QCameraFocus::FocusPointMode(mode));
-}
-#endif
-
 /*!
   \property QDeclarativeCameraFocus::customFocusPoint
 
diff --git a/src/imports/multimedia/qdeclarativecamerafocus_p.h b/src/imports/multimedia/qdeclarativecamerafocus_p.h
index bd5d54d48..df2514f13 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus_p.h
+++ b/src/imports/multimedia/qdeclarativecamerafocus_p.h
@@ -104,11 +104,6 @@ public:
     QPointF customFocusPoint() const;
     QAbstractListModel *focusZones() const;
 
-#if QT_DEPRECATED_SINCE(5, 10)
-    Q_INVOKABLE bool isFocusModeSupported(FocusMode mode) const;
-    Q_INVOKABLE bool isFocusPointModeSupported(FocusPointMode mode) const;
-#endif
-
 public Q_SLOTS:
     void setFocusMode(FocusMode);
     void setFocusPointMode(FocusPointMode mode);