diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-01-05 09:32:38 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-22 06:59:28 +0000 |
commit | 3585c53dc8977198cd08aa01d554cde0e201dd48 (patch) | |
tree | 870d4f2b718ef2554c38d7ca56536069407d5ac7 /src/imports/multimedia/qdeclarativecamera.cpp | |
parent | 5c281da180e86cf1d60e41f124568441f7a0634e (diff) | |
download | qtmultimedia-3585c53dc8977198cd08aa01d554cde0e201dd48.tar.gz |
Rename QMediaObject to QMediaSource
That actually describes what those classes are.
Change-Id: I9ce01707bb260ff6452359e211f2c22b5740e61b
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamera.cpp')
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 53a199364..f36c0c6af 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -147,7 +147,7 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state) Basic camera state management, error reporting, and simple zoom properties are available in the Camera itself. For integration with C++ code, the - \l mediaObject property allows you to + \l mediaSource property allows you to access the standard Qt Multimedia camera controls. Many of the camera settings may take some time to apply, and might be limited @@ -715,7 +715,7 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) } /*! - \qmlproperty variant QtMultimedia::Camera::mediaObject + \qmlproperty variant QtMultimedia::Camera::mediaSource This property holds the native media object for the camera. @@ -723,7 +723,7 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) \code QObject *qmlCamera; // The QML Camera object - QCamera *camera = qvariant_cast<QCamera *>(qmlCamera->property("mediaObject")); + QCamera *camera = qvariant_cast<QCamera *>(qmlCamera->property("mediaSource")); \endcode \note This property is not accessible from QML. |