diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-06-29 10:58:10 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-06-29 12:30:19 +0300 |
| commit | dfbf9769701906e148aa55bd90ab4304a8887d3d (patch) | |
| tree | 2a48fe4b85d86659ea5f9ab816038aa690d45f4e | |
| parent | ba41436c910ccee88e13ceee1546a28f2a94cafc (diff) | |
Remove some features from the Camera demo to make it work with 5.5
We can make the demo work by removing the additional features. The image
is now showing up correctly. There is no capture or other controls.
This is a temporary solution until QtMultimedia gets fixed in a future
release.
Task-number: QTEE-960
Change-Id: Ibf00d323ac47cf04bd0efffe53cf4e053809d4eb
Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
| -rw-r--r-- | basicsuite/camera/Controls.qml | 2 | ||||
| -rw-r--r-- | basicsuite/camera/main.qml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/basicsuite/camera/Controls.qml b/basicsuite/camera/Controls.qml index 64f95bb..52b4206 100644 --- a/basicsuite/camera/Controls.qml +++ b/basicsuite/camera/Controls.qml @@ -134,6 +134,7 @@ Item { } CameraSetting { + visible: false // ### not functional in 5.5.0 id: expCompControl title: "EV" model: ListModel { @@ -188,6 +189,7 @@ Item { } CaptureControl { + visible: false // ### not functional in 5.5.0 id: captureControl anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right diff --git a/basicsuite/camera/main.qml b/basicsuite/camera/main.qml index cb36028..2c68c61 100644 --- a/basicsuite/camera/main.qml +++ b/basicsuite/camera/main.qml @@ -67,7 +67,8 @@ Rectangle { property bool updateFocusPointMode: true property bool captureWhenLocked: false - Component.onCompleted: cameraUtils.setCamera(camera) + // ### breaks in 5.5.0 + // Component.onCompleted: cameraUtils.setCamera(camera) digitalZoom: controls.requestedZoom captureMode: Camera.CaptureStillImage |