summaryrefslogtreecommitdiffstats
path: root/src/multimedia/platform/qplatformcamera.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/platform/qplatformcamera.cpp')
-rw-r--r--src/multimedia/platform/qplatformcamera.cpp27
1 files changed, 1 insertions, 26 deletions
diff --git a/src/multimedia/platform/qplatformcamera.cpp b/src/multimedia/platform/qplatformcamera.cpp
index 796269cda..d0bc9fdcf 100644
--- a/src/multimedia/platform/qplatformcamera.cpp
+++ b/src/multimedia/platform/qplatformcamera.cpp
@@ -94,9 +94,7 @@ QCameraFormat QPlatformCamera::findBestCameraFormat(const QCameraDevice &camera)
Sets the camera \a state.
- State changes are synchronous and indicate user intention,
- while camera status is used as a feedback mechanism to inform application about backend status.
- Status changes are reported asynchronously with QPlatformCamera::statusChanged() signal.
+ State changes are synchronous and indicate user intention.
\sa QCamera::State
*/
@@ -111,21 +109,6 @@ QCameraFormat QPlatformCamera::findBestCameraFormat(const QCameraDevice &camera)
*/
/*!
- \fn QPlatformCamera::status() const
-
- Returns the status of the camera service.
-
- \sa QCamera::state
-*/
-
-/*!
- \fn void QPlatformCamera::statusChanged(QCamera::Status status)
-
- Signal emitted when the camera \a status changes.
-*/
-
-
-/*!
\fn void QPlatformCamera::error(int error, const QString &errorString)
Signal emitted when an error occurs with error code \a error and
@@ -165,14 +148,6 @@ void QPlatformCamera::supportedFeaturesChanged(QCamera::Features f)
emit m_camera->supportedFeaturesChanged();
}
-void QPlatformCamera::statusChanged(QCamera::Status s)
-{
- if (s == m_status)
- return;
- m_status = s;
- emit m_camera->statusChanged(s);
-}
-
void QPlatformCamera::minimumZoomFactorChanged(float factor)
{
if (m_minZoom == factor)