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();