diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2013-10-04 01:16:52 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-10 17:55:19 +0200 |
| commit | 2e1d38a3c719cddd4089709820985822309dc477 (patch) | |
| tree | 4999ff5c091266487eaeefb1a2891ef4fd57ac8b /src/plugins/blackberry/camera/bbcameraviewfindersettingscontrol.cpp | |
| parent | 4cd39cc52f52b07650ea3deb9195b309e214e50f (diff) | |
Enable camera on the Playbook
Change-Id: I61537899bee63150861df57f9140316eca6a6eed
Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'src/plugins/blackberry/camera/bbcameraviewfindersettingscontrol.cpp')
| -rw-r--r-- | src/plugins/blackberry/camera/bbcameraviewfindersettingscontrol.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/blackberry/camera/bbcameraviewfindersettingscontrol.cpp b/src/plugins/blackberry/camera/bbcameraviewfindersettingscontrol.cpp index a63d7a731..5c7671e80 100644 --- a/src/plugins/blackberry/camera/bbcameraviewfindersettingscontrol.cpp +++ b/src/plugins/blackberry/camera/bbcameraviewfindersettingscontrol.cpp @@ -156,10 +156,12 @@ QVariant BbCameraViewfinderSettingsControl::viewfinderParameter(ViewfinderParame return QVideoFrame::Format_Invalid; case CAMERA_FRAMETYPE_CBYCRY: return QVideoFrame::Format_Invalid; +#ifndef Q_OS_BLACKBERRY_TABLET case CAMERA_FRAMETYPE_COMPRESSEDVIDEO: return QVideoFrame::Format_Invalid; case CAMERA_FRAMETYPE_COMPRESSEDAUDIO: return QVideoFrame::Format_Invalid; +#endif default: return QVideoFrame::Format_Invalid; } |