diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-13 14:04:34 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-25 10:33:52 +0100 |
| commit | 11939c8856e5d27ef1b6f025c89a0ff1683075c0 (patch) | |
| tree | e73699a05405c25b0a23c86677276b65fbd70014 /src/plugins/directshow | |
| parent | d5d42a24b5b9d2079d584defac70aef1a1feadef (diff) | |
Update qtbase dependency
- Adapt to QOpenGLWidgets split
- Use new Q_MOC_INCLUDE directive where required
- Fix QtConcurrent usage
Change-Id: I9de650ae4fbbd397ef4fd4650c8aa5a0443d566f
Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
Diffstat (limited to 'src/plugins/directshow')
| -rw-r--r-- | src/plugins/directshow/camera/dscamerasession.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp index cee3e9c56..db7bef895 100644 --- a/src/plugins/directshow/camera/dscamerasession.cpp +++ b/src/plugins/directshow/camera/dscamerasession.cpp @@ -641,7 +641,7 @@ void DSCameraSession::presentFrame() const bool needsVerticalMirroring = m_previewSurfaceFormat.scanLineDirection() != QVideoSurfaceFormat::TopToBottom; captureImage = captureImage.mirrored(m_needsHorizontalMirroring, needsVerticalMirroring); // also causes a deep copy of the data - QtConcurrent::run(this, &DSCameraSession::processCapturedImage, + QtConcurrent::run(&DSCameraSession::processCapturedImage, this, m_currentImageId, m_captureDestinations, captureImage, m_imageCaptureFileName); m_imageCaptureFileName.clear(); |