diff options
| author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-20 11:52:57 +0300 |
|---|---|---|
| committer | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-20 11:52:57 +0300 |
| commit | fb3e9bc2d941462f1244aaf0ea79425a307f883d (patch) | |
| tree | afce91959098ec887ce466abc6e40342261df3db /examples/declarative-camera/declarative-camera.qml | |
| parent | c61d909c7b815319e40ba27d7f84e92aa5f1f946 (diff) | |
| parent | 6f0dc7cc40dd63763a581a7fb6d4e76649b8026c (diff) | |
Merge branch 'master' into 1.2.0v1.2.0
Diffstat (limited to 'examples/declarative-camera/declarative-camera.qml')
| -rw-r--r-- | examples/declarative-camera/declarative-camera.qml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/examples/declarative-camera/declarative-camera.qml b/examples/declarative-camera/declarative-camera.qml index 83509e5b36..c5e8accdb2 100644 --- a/examples/declarative-camera/declarative-camera.qml +++ b/examples/declarative-camera/declarative-camera.qml @@ -43,8 +43,6 @@ import QtMultimediaKit 1.1 Rectangle { id : cameraUI - width : 800 - height : 480 color: "black" state: "PhotoCapture" @@ -90,11 +88,11 @@ Rectangle { Camera { id: camera - x : 0 - y : 0 - width : 640 - height : 480 - focus : visible //to receive focus and capture key events + x: 0 + y: 0 + width: parent.width - stillControls.buttonsPanelWidth + height: parent.height + focus: visible //to receive focus and capture key events //captureResolution : "640x480" flashMode: stillControls.flashMode |