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/qtmultimediaquicktools | |
| 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/qtmultimediaquicktools')
5 files changed, 6 insertions, 4 deletions
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_p.h b/src/qtmultimediaquicktools/qdeclarativevideooutput_p.h index d14731c91..a29e11ccf 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput_p.h +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_p.h @@ -61,6 +61,8 @@ #include <private/qtmultimediaquickdefs_p.h> +Q_MOC_INCLUDE("QtMultimedia/qabstractvideosurface.h") + QT_BEGIN_NAMESPACE class QMediaObject; diff --git a/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp b/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp index d039e1e0b..4fb62921e 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp +++ b/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp @@ -42,7 +42,7 @@ #include <QtCore/qmutex.h> #include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLFunctions> -#include <QtGui/QOpenGLShaderProgram> +#include <QtOpenGL/QOpenGLShaderProgram> QT_BEGIN_NAMESPACE diff --git a/src/qtmultimediaquicktools/qsgvideonode_texture.cpp b/src/qtmultimediaquicktools/qsgvideonode_texture.cpp index 473a4144f..404199102 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_texture.cpp +++ b/src/qtmultimediaquicktools/qsgvideonode_texture.cpp @@ -42,7 +42,7 @@ #include <QtCore/qmutex.h> #include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLFunctions> -#include <QtGui/QOpenGLShaderProgram> +#include <QtOpenGL/QOpenGLShaderProgram> #include <QtMultimedia/private/qmediaopenglhelper_p.h> #include <QtMultimedia/private/qtmultimediaglobal_p.h> diff --git a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp index f07362bf1..2b50e9cb0 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp +++ b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp @@ -42,7 +42,7 @@ #include <QtQuick/qsgmaterial.h> #include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLFunctions> -#include <QtGui/QOpenGLShaderProgram> +#include <QtOpenGL/QOpenGLShaderProgram> #ifndef GL_RED #define GL_RED 0x1903 diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro index cb1f8106b..4f3908f6a 100644 --- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro +++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro @@ -1,6 +1,6 @@ TARGET = QtMultimediaQuick -QT = core quick multimedia-private +QT = core opengl quick multimedia-private CONFIG += internal_module PRIVATE_HEADERS += \ |