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/android/src/mediacapture/qandroidcamerasession.cpp | |
| 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/android/src/mediacapture/qandroidcamerasession.cpp')
| -rw-r--r-- | src/plugins/android/src/mediacapture/qandroidcamerasession.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp b/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp index a0f809376..ff5c7be15 100644 --- a/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp +++ b/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp @@ -732,7 +732,7 @@ void QAndroidCameraSession::onLastPreviewFrameFetched(const QVideoFrame &frame) if (m_captureCanceled || !m_camera) return; - QtConcurrent::run(this, &QAndroidCameraSession::processPreviewImage, + QtConcurrent::run(&QAndroidCameraSession::processPreviewImage, this, m_currentImageCaptureId, frame, m_camera->getRotation()); @@ -771,7 +771,7 @@ void QAndroidCameraSession::onCameraPictureCaptured(const QByteArray &data) { if (!m_captureCanceled) { // Loading and saving the captured image can be slow, do it in a separate thread - QtConcurrent::run(this, &QAndroidCameraSession::processCapturedImage, + QtConcurrent::run(&QAndroidCameraSession::processCapturedImage, this, m_currentImageCaptureId, data, m_actualImageSettings.resolution(), |