diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-10 03:05:22 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-10 03:05:22 +0100 |
| commit | 9514bba6c6bb41e304b450544c6e6b69080572a5 (patch) | |
| tree | c263293631f8a4616e13bf19034e0fa1c314af24 /src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm | |
| parent | 19477de84a64f412bca9ce2df62ab9adb3859da2 (diff) | |
| parent | 7f0a20ad066020d913faff636b8a0c5f61d2dfe0 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I4ea49723c74c6dccf141b65f834b5d539d2ab9d7
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm b/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm index 0359f5d0a..9e1bf3f84 100644 --- a/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm +++ b/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm @@ -297,11 +297,9 @@ void AVFCameraRendererControl::setSurface(QAbstractVideoSurface *surface) { if (m_surface != surface) { m_surface = surface; -#ifdef Q_OS_IOS m_supportsTextures = m_surface - ? m_surface->supportedPixelFormats(QAbstractVideoBuffer::GLTextureHandle).contains(QVideoFrame::Format_BGRA32) + ? !m_surface->supportedPixelFormats(QAbstractVideoBuffer::GLTextureHandle).isEmpty() : false; -#endif Q_EMIT surfaceChanged(surface); } } |