slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.3' into dev

Browse Source 
Change-Id: I38ebcb3da0e4d2acc9e7108c9579ea98323864e0
This commit is contained in:
Frederik Gladhorn
2014-07-10 10:14:36 +02:00
parent 4ba4f1a51d 8da61153c9
commit 074bd6ab37
15 changed files with 110 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/imports/multimedia/qdeclarativecamera.cpp
View File

@@ -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.
*/
/*!