diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-10 10:14:36 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-10 10:14:36 +0200 |
| commit | 074bd6ab37bbbb4dbba188921783fd98be872555 (patch) | |
| tree | 318284e5ce86569c6d0c9c37d143b6f63781eede /src/imports/multimedia | |
| parent | 4ba4f1a51db14c1df20b27cc375255077f051819 (diff) | |
| parent | 8da61153c9b4e505b6f8a0e7a6c630690516d845 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: I38ebcb3da0e4d2acc9e7108c9579ea98323864e0
Diffstat (limited to 'src/imports/multimedia')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index c6c57f8c1..7e43875a0 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -634,13 +634,13 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) */ /*! - \qmlsignal Camera::stateChanged(state) + \qmlsignal Camera::cameraStateChanged(state) This signal is emitted when the camera state has changed to \a state. Since the state changes may take some time to occur this signal may arrive sometime after the state change has been requested. - The corresponding handler is \c onStateChanged. + The corresponding handler is \c onCameraStateChanged. */ /*! |