slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Camera: update viewfinder settings on Loaded status.

Browse Source 
Change-Id: I9a341c7500b09d39554118689e6e83cd1b798e39
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
This commit is contained in:
Yoann Lopes
2015-01-21 14:09:08 +01:00
parent 9444c8ec61
commit bc2c42d6c6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/imports/multimedia/qdeclarativecameraviewfinder.cpp
View File

@@ -100,7 +100,9 @@ void QDeclarativeCameraViewfinder::_q_cameraStatusChanged(QCamera::Status status
{ {
// Settings values might change when the camera starts, for example if the settings are // Settings values might change when the camera starts, for example if the settings are
// undefined, if unsupported values were set or if the settings conflict with capture settings. // undefined, if unsupported values were set or if the settings conflict with capture settings.
if (status == QCamera::ActiveStatus) { // They might also change on LoadedStatus, for example reverting to values that were set by the
// user.
if (status == QCamera::ActiveStatus || status == QCamera::LoadedStatus) {
QCameraViewfinderSettings oldSettings = m_settings; QCameraViewfinderSettings oldSettings = m_settings;
m_settings = m_camera->viewfinderSettings(); m_settings = m_camera->viewfinderSettings();
if (oldSettings.resolution() != m_settings.resolution()) if (oldSettings.resolution() != m_settings.resolution())