diff options
author | Andrew den Exter <andrew.den.exter@jollamobile.com> | 2013-12-10 17:50:01 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-13 06:05:52 +0100 |
commit | 61001f8dd5a1b2d128259b518f74d46cf9f69173 (patch) | |
tree | f0c37887650fe37b0ecccad981c05fd4af9bc43a /src/imports/multimedia/qdeclarativecameracapture.cpp | |
parent | 2ec3645b729d4a9ccc3b4bfbf4d64c6def69b68f (diff) |
Fix recording settings being discarded by the Camera QML type.
Query existing settings from the recorder instead of locally cached
settings as some other agent may have applied some settings separately
and those would otherwise be discarded.
Change-Id: I0ebeaf06c6f7306c5987aa269032842b538a6a8b
Reviewed-by: John Brooks <john.brooks@dereferenced.net>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecameracapture.cpp')
-rw-r--r-- | src/imports/multimedia/qdeclarativecameracapture.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp index b93ab456e..d5f363431 100644 --- a/src/imports/multimedia/qdeclarativecameracapture.cpp +++ b/src/imports/multimedia/qdeclarativecameracapture.cpp @@ -267,6 +267,7 @@ QSize QDeclarativeCameraCapture::resolution() void QDeclarativeCameraCapture::setResolution(const QSize &captureResolution) { + m_imageSettings = m_capture->encodingSettings(); if (captureResolution != resolution()) { m_imageSettings.setResolution(captureResolution); m_capture->setEncodingSettings(m_imageSettings); |