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>

8 files changed, 10 insertions, 10 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(),
diff --git a/src/plugins/android/src/src.pro b/src/plugins/android/src/src.pro
index 166bcc42b..5e47a7d09 100644
--- a/src/plugins/android/src/src.pro
+++ b/src/plugins/android/src/src.pro
@@ -1,6 +1,6 @@
 TARGET = qtmedia_android
 
-QT += multimedia-private core-private network
+QT += opengl multimedia-private core-private network
 
 HEADERS += \
     qandroidmediaserviceplugin.h
diff --git a/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm b/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
index 55a20b1bd..58d42bcaf 100644
--- a/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
+++ b/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
@@ -200,7 +200,7 @@ void AVFImageCaptureControl::onNewViewfinderFrame(const QVideoFrame &frame)
     CaptureRequest request = m_captureRequests.dequeue();
     Q_EMIT imageExposed(request.captureId);
 
-    QtConcurrent::run(this, &AVFImageCaptureControl::makeCapturePreview,
+    QtConcurrent::run(&AVFImageCaptureControl::makeCapturePreview, this,
                       request,
                       frame,
                       0 /* rotation */);
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm b/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm
index 51f961729..2cdf1cac9 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm
@@ -40,7 +40,7 @@
 #include "avfvideoframerenderer.h"
 
 #include <QtMultimedia/qabstractvideosurface.h>
-#include <QtGui/QOpenGLFramebufferObject>
+#include <QtOpenGL/QOpenGLFramebufferObject>
 #include <QtGui/QWindow>
 
 #ifdef QT_DEBUG_AVF
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm b/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm
index 70e402e6c..ed2051449 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm
@@ -40,8 +40,8 @@
 #include "avfvideoframerenderer_ios.h"
 
 #include <QtMultimedia/qabstractvideosurface.h>
-#include <QtGui/QOpenGLFramebufferObject>
-#include <QtGui/QOpenGLShaderProgram>
+#include <QtOpenGL/QOpenGLFramebufferObject>
+#include <QtOpenGL/QOpenGLShaderProgram>
 #include <QtGui/QOffscreenSurface>
 
 #ifdef QT_DEBUG_AVF
diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
index b60b276e9..d1dab530f 100644
--- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
+++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
@@ -4,7 +4,7 @@ TARGET = qavfmediaplayer
 # Avoid clash with a variable named `slots' in a Quartz header
 CONFIG += no_keywords
 
-QT += multimedia-private network
+QT += opengl multimedia-private network
 
 LIBS += -framework CoreMedia -framework CoreVideo -framework QuartzCore
 
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();
diff --git a/src/plugins/opensles/opensles.pro b/src/plugins/opensles/opensles.pro
index 2bb0f3cf5..1a554f53e 100644
--- a/src/plugins/opensles/opensles.pro
+++ b/src/plugins/opensles/opensles.pro
@@ -1,5 +1,5 @@
 TARGET = qtaudio_opensles
-QT += multimedia-private core-private
+QT += opengl multimedia-private core-private
 
 LIBS += -lOpenSLES