diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 13:15:45 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 13:15:45 +0200 |
| commit | 0ef52f01029176a8fb8fbef2c22ae9350635ebe1 (patch) | |
| tree | fad805097d0e40ba57dcfb61ac3067737c7a2ae3 /src/imports/multimedia/qdeclarativecamerafocus.cpp | |
| parent | cb324a50c920b275ef6c04162712b1a6f19bbe8d (diff) | |
| parent | 5c087bb6153b951e1c5709ee7f998819d08a6122 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I24ffb71c4cc2e262394797deb8a22b2cf9a80c3c
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamerafocus.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamerafocus.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp index 19d8ca81e..4b5544d2a 100644 --- a/src/imports/multimedia/qdeclarativecamerafocus.cpp +++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp @@ -179,7 +179,10 @@ bool QDeclarativeCameraFocus::isFocusModeSupported(QDeclarativeCamera::FocusMode void QDeclarativeCameraFocus::setFocusMode(QDeclarativeCamera::FocusMode mode) { - m_focus->setFocusMode(QCameraFocus::FocusModes(int(mode))); + if (mode != focusMode()) { + m_focus->setFocusMode(QCameraFocus::FocusModes(int(mode))); + emit focusModeChanged(focusMode()); + } } /*! \property QDeclarativeCameraFocus::focusPointMode |