Build fix after refactor

Change-Id: I2de40846fc7402ddf32259d42a486a74330ff626
2011-09-13 13:18:52 +02:00
parent d690596868
commit 4840be0239
13 changed files with 15 additions and 14 deletions
--- 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);
--- 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>
--- 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
--- 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>
--- 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>
--- 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

--- 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

--- 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"
--- 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"
--- 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>

--- 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>

--- 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>

--- 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>