summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2011-08-30 14:42:21 +1000
committerMichael Goddard <michael.goddard@nokia.com>2011-08-30 15:34:30 +1000
commit3bf236cc23c2e67e1b5cbc01e05e61263528fc10 (patch)
treeb6b547e7863a929a2638528cddfd52c0fff6f8d9 /examples
parent4ddffcdae313bf494ac12d098743af341add77e3 (diff)
parent47a5dd4371bfc6774790cc900e287f5def12406a (diff)
Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakit
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative-camera/CaptureControls.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative-camera/CaptureControls.qml b/examples/declarative-camera/CaptureControls.qml
index cf2c77d44..3332fe1d2 100644
--- a/examples/declarative-camera/CaptureControls.qml
+++ b/examples/declarative-camera/CaptureControls.qml
@@ -136,8 +136,8 @@ FocusScope {
}
ListElement {
icon: "images/camera_white_balance_incandescent.png"
- value: Camera.WhiteBalanceIncandescent
- text: "Incandescent"
+ value: Camera.WhiteBalanceTungsten
+ text: "Tungsten"
}
ListElement {
icon: "images/camera_white_balance_flourescent.png"