diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-06-28 10:16:40 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-07-04 13:20:27 +0000 |
| commit | 59f20906d9d6d7bc33069fc0960c59edf0e232e1 (patch) | |
| tree | db09d0be49a6c5184d8a5539c2a9f2e0bf268bf4 /src/plugins/winrt | |
| parent | bc53bb7913bbf68519508a0ab76c513335b3e5bb (diff) | |
winrt: Do not assert when missing region of interest
Asserting is too heavy and can cause false positive on devices like the
Lumia 535, where focus is supported, but not setting a focus point.
Later on we check for existence of the control during the
initialization, so it is safe to continue here.
Task-number: QTBUG-54278
Change-Id: Ie68ff754d742888bdd6f4047e07d207707c90c91
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins/winrt')
| -rw-r--r-- | src/plugins/winrt/qwinrtcameracontrol.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp index f11a975b2..73ae4b067 100644 --- a/src/plugins/winrt/qwinrtcameracontrol.cpp +++ b/src/plugins/winrt/qwinrtcameracontrol.cpp @@ -942,7 +942,8 @@ HRESULT QWinRTCameraControl::initialize() Q_ASSERT_SUCCEEDED(hr); if (isFocusSupported) { hr = advancedVideoDeviceController->get_RegionsOfInterestControl(&d->regionsOfInterestControl); - Q_ASSERT_SUCCEEDED(hr); + if (FAILED(hr)) + qCDebug(lcMMCamera) << "Focus supported, but no control for regions of interest available"; hr = initializeFocus(); Q_ASSERT_SUCCEEDED(hr); } else { |