Fix a number of doc errors and warnings.

* Document a few missing classes/functions/methods
* Fix a number of QML snippets that wouldn't work as standalone snippets
* Add files to .pro so they show up in Creator..

Still the mysterious lack of controls dir documentation persists :/

Change-Id: I57162371a4d966e4db5bdb1b71d1baf9c0ca57c3
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2012-04-10 20:19:34 +10:00
committed by Qt by Nokia
parent 9b162f9844
commit 8484b0ff9c
20 changed files with 594 additions and 327 deletions

View File

@@ -93,32 +93,38 @@ void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityError
import QtQuick 2.0
import QtMultimedia 5.0
Camera {
id: camera
Item {
width: 640
height: 360
imageProcessing.whiteBalanceMode: CameraImageProcessing.WhiteBalanceFlash
Camera {
id: camera
exposure {
exposureCompensation: -1.0
exposureMode: Camera.ExposurePortrait
}
imageProcessing.whiteBalanceMode: CameraImageProcessing.WhiteBalanceFlash
flash.mode: Camera.FlashRedEyeReduction
exposure {
exposureCompensation: -1.0
exposureMode: Camera.ExposurePortrait
}
imageCapture {
onImageCaptured: {
photoPreview.source = preview // Show the preview in an Image element
flash.mode: Camera.FlashRedEyeReduction
imageCapture {
onImageCaptured: {
photoPreview.source = preview // Show the preview in an Image element
}
}
}
}
VideoOutput {
source: camera
focus : visible // to receive focus and capture key events when visible
}
VideoOutput {
source: camera
anchors.fill: parent
focus : visible // to receive focus and capture key events when visible
}
Image {
id: photoPreview
Image {
id: photoPreview
}
}
\endqml