diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-01-21 14:09:08 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-02-04 17:09:10 +0000 |
| commit | bc2c42d6c6a927688a17ca5060c25a4e5c709734 (patch) | |
| tree | 0b2604ab8f28d3a304dea44f8a5b6f418e82ce24 /src/imports | |
| parent | 9444c8ec6161bee3e399f9d385974dbaa6216283 (diff) | |
Camera: update viewfinder settings on Loaded status.
Change-Id: I9a341c7500b09d39554118689e6e83cd1b798e39
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecameraviewfinder.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/multimedia/qdeclarativecameraviewfinder.cpp b/src/imports/multimedia/qdeclarativecameraviewfinder.cpp index abb0b6290..97d93ec0a 100644 --- a/src/imports/multimedia/qdeclarativecameraviewfinder.cpp +++ b/src/imports/multimedia/qdeclarativecameraviewfinder.cpp @@ -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 // 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; m_settings = m_camera->viewfinderSettings(); if (oldSettings.resolution() != m_settings.resolution()) |