diff options
Diffstat (limited to 'src/multimedia/camera')
-rw-r--r-- | src/multimedia/camera/qcamera.cpp | 13 | ||||
-rw-r--r-- | src/multimedia/camera/qcameraimageprocessing.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/camera/qcameraviewfindersettings.cpp | 12 |
3 files changed, 26 insertions, 1 deletions
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index e70bed047..a5fee2767 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -1043,6 +1043,19 @@ void QCamera::unlock() */ /*! + \fn QCamera::FrameRateRange::FrameRateRange() + + Constructs a null frame rate range, with both minimumFrameRate and maximumFrameRate + equal to \c 0.0. +*/ + +/*! + \fn QCamera::FrameRateRange::FrameRateRange(qreal minimum, qreal maximum) + + Constructs a frame rate range with the given \a minimum and \a maximum frame rates. +*/ + +/*! \variable QCamera::FrameRateRange::minimumFrameRate The minimum frame rate supported by the range, in frames per second. */ diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp index 24d53eb7e..4ce3759e4 100644 --- a/src/multimedia/camera/qcameraimageprocessing.cpp +++ b/src/multimedia/camera/qcameraimageprocessing.cpp @@ -319,7 +319,7 @@ void QCameraImageProcessing::setDenoisingLevel(qreal level) */ /*! - \enum QCameraImageProcessing::Filter + \enum QCameraImageProcessing::ColorFilter \value ColorFilterNone No filter is applied to images. \value ColorFilterGrayscale A grayscale filter. diff --git a/src/multimedia/camera/qcameraviewfindersettings.cpp b/src/multimedia/camera/qcameraviewfindersettings.cpp index a92ee65ad..df4fa7022 100644 --- a/src/multimedia/camera/qcameraviewfindersettings.cpp +++ b/src/multimedia/camera/qcameraviewfindersettings.cpp @@ -135,6 +135,18 @@ QCameraViewfinderSettings &QCameraViewfinderSettings::operator=(const QCameraVie return *this; } +/*! \fn QCameraViewfinderSettings &QCameraViewfinderSettings::operator=(QCameraViewfinderSettings &&other) + + Moves \a other to this viewfinder settings object and returns a reference to this object. +*/ + +/*! + \fn void QCameraViewfinderSettings::swap(QCameraViewfinderSettings &other) + + Swaps this viewfinder settings object with \a other. This + function is very fast and never fails. +*/ + /*! \relates QCameraViewfinderSettings \since 5.5 |