slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build fix after refactor

Browse Source 
Change-Id: I2de40846fc7402ddf32259d42a486a74330ff626
This commit is contained in:
Lasse Holmstedt
2011-09-13 13:18:52 +02:00
parent d690596868
commit 4840be0239
13 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/imports/multimedia/qsgvideonode_i420.cpp
View File

@@ -41,7 +41,8 @@
#include "qsgvideonode_i420.h" #include "qsgvideonode_i420.h"
#include <QtDeclarative/qsgtexturematerial.h> #include <QtDeclarative/qsgtexturematerial.h>
#include <QtDeclarative/qsgmaterial.h> #include <QtDeclarative/qsgmaterial.h>
#include <QtGui/QOpenGLContext>
#include <QtGui/QOpenGLFunctions>
#include <QtOpenGL/qglshaderprogram.h> #include <QtOpenGL/qglshaderprogram.h>
QList<QVideoFrame::PixelFormat> QSGVideoNodeFactory_I420::supportedPixelFormats( QList<QVideoFrame::PixelFormat> QSGVideoNodeFactory_I420::supportedPixelFormats(
@@ -271,7 +272,7 @@ void QSGVideoMaterialShader_YUV420::updateState(const RenderState &state,
{ {
Q_UNUSED(oldMaterial); Q_UNUSED(oldMaterial);
QGLFunctions *functions = state.context()->functions(); QOpenGLFunctions *functions = state.context()->functions();
QSGVideoMaterial_YUV420 *mat = static_cast<QSGVideoMaterial_YUV420 *>(newMaterial); QSGVideoMaterial_YUV420 *mat = static_cast<QSGVideoMaterial_YUV420 *>(newMaterial);
program()->setUniformValue(m_id_yTexture, 0); program()->setUniformValue(m_id_yTexture, 0);
program()->setUniformValue(m_id_uTexture, 1); program()->setUniformValue(m_id_uTexture, 1);

2
src/multimediakit/audio/qaudiopluginloader.cpp
View File

@@ -43,7 +43,7 @@
#include "qaudiopluginloader_p.h" #include "qaudiopluginloader_p.h"
#include <QtCore/qcoreapplication.h> #include <QtCore/qcoreapplication.h>
#include <QtGui/qapplication.h> #include <QtWidgets/qapplication.h>
#include <QtCore/qpluginloader.h> #include <QtCore/qpluginloader.h>
#include <QtCore/qfactoryinterface.h> #include <QtCore/qfactoryinterface.h>
#include <QtCore/qdir.h> #include <QtCore/qdir.h>

2
src/multimediakit/multimediakit.pro
View File

@@ -3,7 +3,7 @@ load(qt_module)
# distinct from QtMultimedia # distinct from QtMultimedia
TARGET = QtMultimediaKit TARGET = QtMultimediaKit
QPRO_PWD = $$PWD QPRO_PWD = $$PWD
QT = core network gui QT = core network gui widgets
CONFIG += module CONFIG += module
MODULE_PRI += ../../modules/qt_multimediakit.pri MODULE_PRI += ../../modules/qt_multimediakit.pri

2
src/multimediakitwidgets/qgraphicsvideoitem.h
View File

@@ -42,7 +42,7 @@
#ifndef QGRAPHICSVIDEOITEM_H #ifndef QGRAPHICSVIDEOITEM_H
#define QGRAPHICSVIDEOITEM_H #define QGRAPHICSVIDEOITEM_H
#include <QtGui/qgraphicsitem.h> #include <QtWidgets/qgraphicsitem.h>
#include <qvideowidget.h> #include <qvideowidget.h>
#include <qmediabindableinterface.h> #include <qmediabindableinterface.h>

2
src/multimediakitwidgets/qvideowidget.h
View File

@@ -42,7 +42,7 @@
#ifndef QVIDEOWIDGET_H #ifndef QVIDEOWIDGET_H
#define QVIDEOWIDGET_H #define QVIDEOWIDGET_H
#include <QtGui/qwidget.h> #include <QtWidgets/qwidget.h>
#include <qtmultimediakitwidgetdefs.h> #include <qtmultimediakitwidgetdefs.h>
#include <qmediabindableinterface.h> #include <qmediabindableinterface.h>

2
src/multimediakitwidgets/qvideowidgetcontrol.h
View File

@@ -45,7 +45,7 @@
#include "qvideowidget.h" #include "qvideowidget.h"
#include "qmediacontrol.h" #include "qmediacontrol.h"
#include <QtGui/qwidget.h> #include <QtWidgets/qwidget.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/multimediakitwidgets/qvideowindowcontrol.h
View File

@@ -45,7 +45,7 @@
#include "qmediacontrol.h" #include "qmediacontrol.h"
#include "qvideowidget.h" #include "qvideowidget.h"
#include <QtGui/qwidget.h> #include <QtWidgets/qwidget.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/fakeradio/fakeradioservice.cpp
View File

@@ -42,7 +42,7 @@
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtCore/qfile.h> #include <QtCore/qfile.h>
#include <QtGui/qwidget.h> #include <QtWidgets/qwidget.h>
#include "fakeradioservice.h" #include "fakeradioservice.h"
#include "fakeradiotunercontrol.h" #include "fakeradiotunercontrol.h"

2
src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
View File

@@ -41,7 +41,7 @@
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtGui/qwidget.h> #include <QtWidgets/qwidget.h>
#include "qgstreamerplayerservice.h" #include "qgstreamerplayerservice.h"
#include "qgstreamerplayercontrol.h" #include "qgstreamerplayercontrol.h"

2
src/plugins/gstreamer/qgstreameraudioinputendpointselector.cpp
View File

@@ -41,7 +41,7 @@
#include "qgstreameraudioinputendpointselector.h" #include "qgstreameraudioinputendpointselector.h"
#include <QtGui/QIcon> #include <QtWidgets/QIcon>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QDebug> #include <QtCore/QDebug>

2
src/plugins/gstreamer/qgstreamerserviceplugin.cpp
View File

@@ -41,7 +41,7 @@
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtGui/QIcon> #include <QtWidgets/QIcon>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QDebug> #include <QtCore/QDebug>

2
src/plugins/gstreamer/qgstreamervideoinputdevicecontrol.cpp
View File

@@ -41,7 +41,7 @@
#include "qgstreamervideoinputdevicecontrol.h" #include "qgstreamervideoinputdevicecontrol.h"
#include <QtGui/QIcon> #include <QtWidgets/QIcon>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QDebug> #include <QtCore/QDebug>

2
src/plugins/gstreamer/qgstreamervideorenderer.cpp
View File

@@ -44,7 +44,7 @@
#include "qabstractvideosurface.h" #include "qabstractvideosurface.h"
#include <QEvent> #include <QEvent>
#include <QApplication> #include <QtWidgets/QApplication>
#include <QDebug> #include <QDebug>
#include <gst/gst.h> #include <gst/gst.h>