diff options
author | Lasse Holmstedt <lasse.holmstedt@nokia.com> | 2011-09-13 13:18:52 +0200 |
---|---|---|
committer | Lasse Holmstedt <lasse.holmstedt@nokia.com> | 2011-09-13 13:28:28 +0200 |
commit | 4840be02398041315da8be67041a8cd9152ee8a1 (patch) | |
tree | 1827c722b3aed364e582eec62d63a5b0cf52303e /src | |
parent | d690596868be79fc0212d39707d5bc052700e24c (diff) |
Build fix after refactor
Change-Id: I2de40846fc7402ddf32259d42a486a74330ff626
Diffstat (limited to 'src')
13 files changed, 15 insertions, 14 deletions
diff --git a/src/imports/multimedia/qsgvideonode_i420.cpp b/src/imports/multimedia/qsgvideonode_i420.cpp index 0342de565..c6970a5bd 100644 --- a/src/imports/multimedia/qsgvideonode_i420.cpp +++ b/src/imports/multimedia/qsgvideonode_i420.cpp @@ -41,7 +41,8 @@ #include "qsgvideonode_i420.h" #include <QtDeclarative/qsgtexturematerial.h> #include <QtDeclarative/qsgmaterial.h> - +#include <QtGui/QOpenGLContext> +#include <QtGui/QOpenGLFunctions> #include <QtOpenGL/qglshaderprogram.h> QList<QVideoFrame::PixelFormat> QSGVideoNodeFactory_I420::supportedPixelFormats( @@ -271,7 +272,7 @@ void QSGVideoMaterialShader_YUV420::updateState(const RenderState &state, { Q_UNUSED(oldMaterial); - QGLFunctions *functions = state.context()->functions(); + QOpenGLFunctions *functions = state.context()->functions(); QSGVideoMaterial_YUV420 *mat = static_cast<QSGVideoMaterial_YUV420 *>(newMaterial); program()->setUniformValue(m_id_yTexture, 0); program()->setUniformValue(m_id_uTexture, 1); diff --git a/src/multimediakit/audio/qaudiopluginloader.cpp b/src/multimediakit/audio/qaudiopluginloader.cpp index cbf84d1d4..4aa24d57b 100644 --- a/src/multimediakit/audio/qaudiopluginloader.cpp +++ b/src/multimediakit/audio/qaudiopluginloader.cpp @@ -43,7 +43,7 @@ #include "qaudiopluginloader_p.h" #include <QtCore/qcoreapplication.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qapplication.h> #include <QtCore/qpluginloader.h> #include <QtCore/qfactoryinterface.h> #include <QtCore/qdir.h> diff --git a/src/multimediakit/multimediakit.pro b/src/multimediakit/multimediakit.pro index f3fdd6880..7990429af 100644 --- a/src/multimediakit/multimediakit.pro +++ b/src/multimediakit/multimediakit.pro @@ -3,7 +3,7 @@ load(qt_module) # distinct from QtMultimedia TARGET = QtMultimediaKit QPRO_PWD = $$PWD -QT = core network gui +QT = core network gui widgets CONFIG += module MODULE_PRI += ../../modules/qt_multimediakit.pri diff --git a/src/multimediakitwidgets/qgraphicsvideoitem.h b/src/multimediakitwidgets/qgraphicsvideoitem.h index 309ec4ddb..d670e6cf4 100644 --- a/src/multimediakitwidgets/qgraphicsvideoitem.h +++ b/src/multimediakitwidgets/qgraphicsvideoitem.h @@ -42,7 +42,7 @@ #ifndef QGRAPHICSVIDEOITEM_H #define QGRAPHICSVIDEOITEM_H -#include <QtGui/qgraphicsitem.h> +#include <QtWidgets/qgraphicsitem.h> #include <qvideowidget.h> #include <qmediabindableinterface.h> diff --git a/src/multimediakitwidgets/qvideowidget.h b/src/multimediakitwidgets/qvideowidget.h index 4a400399c..9af13da79 100644 --- a/src/multimediakitwidgets/qvideowidget.h +++ b/src/multimediakitwidgets/qvideowidget.h @@ -42,7 +42,7 @@ #ifndef QVIDEOWIDGET_H #define QVIDEOWIDGET_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include <qtmultimediakitwidgetdefs.h> #include <qmediabindableinterface.h> diff --git a/src/multimediakitwidgets/qvideowidgetcontrol.h b/src/multimediakitwidgets/qvideowidgetcontrol.h index d5797918d..e1ea83be9 100644 --- a/src/multimediakitwidgets/qvideowidgetcontrol.h +++ b/src/multimediakitwidgets/qvideowidgetcontrol.h @@ -45,7 +45,7 @@ #include "qvideowidget.h" #include "qmediacontrol.h" -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/multimediakitwidgets/qvideowindowcontrol.h b/src/multimediakitwidgets/qvideowindowcontrol.h index c48294d85..02849135e 100644 --- a/src/multimediakitwidgets/qvideowindowcontrol.h +++ b/src/multimediakitwidgets/qvideowindowcontrol.h @@ -45,7 +45,7 @@ #include "qmediacontrol.h" #include "qvideowidget.h" -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/fakeradio/fakeradioservice.cpp b/src/plugins/fakeradio/fakeradioservice.cpp index 6ddf4426b..144e3b3c7 100644 --- a/src/plugins/fakeradio/fakeradioservice.cpp +++ b/src/plugins/fakeradio/fakeradioservice.cpp @@ -42,7 +42,7 @@ #include <QtCore/qvariant.h> #include <QtCore/qdebug.h> #include <QtCore/qfile.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include "fakeradioservice.h" #include "fakeradiotunercontrol.h" diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp index 1cd595ef6..7c017e284 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp @@ -41,7 +41,7 @@ #include <QtCore/qvariant.h> #include <QtCore/qdebug.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include "qgstreamerplayerservice.h" #include "qgstreamerplayercontrol.h" diff --git a/src/plugins/gstreamer/qgstreameraudioinputendpointselector.cpp b/src/plugins/gstreamer/qgstreameraudioinputendpointselector.cpp index 3605c576d..9433850bd 100644 --- a/src/plugins/gstreamer/qgstreameraudioinputendpointselector.cpp +++ b/src/plugins/gstreamer/qgstreameraudioinputendpointselector.cpp @@ -41,7 +41,7 @@ #include "qgstreameraudioinputendpointselector.h" -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include <QtCore/QDir> #include <QtCore/QDebug> diff --git a/src/plugins/gstreamer/qgstreamerserviceplugin.cpp b/src/plugins/gstreamer/qgstreamerserviceplugin.cpp index c4ca9cdda..baa5bae06 100644 --- a/src/plugins/gstreamer/qgstreamerserviceplugin.cpp +++ b/src/plugins/gstreamer/qgstreamerserviceplugin.cpp @@ -41,7 +41,7 @@ #include <QtCore/qstring.h> #include <QtCore/qdebug.h> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include <QtCore/QDir> #include <QtCore/QDebug> diff --git a/src/plugins/gstreamer/qgstreamervideoinputdevicecontrol.cpp b/src/plugins/gstreamer/qgstreamervideoinputdevicecontrol.cpp index d0280346a..ec9e9baf4 100644 --- a/src/plugins/gstreamer/qgstreamervideoinputdevicecontrol.cpp +++ b/src/plugins/gstreamer/qgstreamervideoinputdevicecontrol.cpp @@ -41,7 +41,7 @@ #include "qgstreamervideoinputdevicecontrol.h" -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include <QtCore/QDir> #include <QtCore/QDebug> diff --git a/src/plugins/gstreamer/qgstreamervideorenderer.cpp b/src/plugins/gstreamer/qgstreamervideorenderer.cpp index d32e98ddb..e924f8353 100644 --- a/src/plugins/gstreamer/qgstreamervideorenderer.cpp +++ b/src/plugins/gstreamer/qgstreamervideorenderer.cpp @@ -44,7 +44,7 @@ #include "qabstractvideosurface.h" #include <QEvent> -#include <QApplication> +#include <QtWidgets/QApplication> #include <QDebug> #include <gst/gst.h> |