Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakit

Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b
2011-08-30 14:42:21 +10:00
parent 4ddffcdae3 47a5dd4371
commit 3bf236cc23
58 changed files with 2121 additions and 977 deletions
--- 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"