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

Fix compilation without QtWidgets and QtOpenGL on Mac

Browse Source 
Change-Id: I3cff7e41d27955e37bc8207e4820fdc21ce75f7b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Kent Hansen
2012-06-06 22:21:39 +02:00
committed by Qt by Nokia
parent d91d3b9b18
commit 2d8f81b857
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt7/mediaplayer/qt7playerservice.mm
View File

@@ -41,7 +41,6 @@
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtWidgets/qwidget.h>
#include "qt7backend.h" #include "qt7backend.h"
#include "qt7playerservice.h" #include "qt7playerservice.h"
@@ -51,7 +50,9 @@
#include "qt7movieviewoutput.h" #include "qt7movieviewoutput.h"
#include "qt7movieviewrenderer.h" #include "qt7movieviewrenderer.h"
#include "qt7movierenderer.h" #include "qt7movierenderer.h"
#ifndef QT_NO_WIDGETS
#include "qt7movievideowidget.h" #include "qt7movievideowidget.h"
#endif
#include "qt7playermetadata.h" #include "qt7playermetadata.h"
#include <private/qmediaplaylistnavigator_p.h> #include <private/qmediaplaylistnavigator_p.h>
@@ -95,16 +96,20 @@ QMediaControl *QT7PlayerService::requestControl(const char *name)
if (qstrcmp(name, QVideoRendererControl_iid) == 0) { if (qstrcmp(name, QVideoRendererControl_iid) == 0) {
#ifdef QUICKTIME_C_API_AVAILABLE #ifdef QUICKTIME_C_API_AVAILABLE
m_videoOutput = new QT7MovieRenderer(this); m_videoOutput = new QT7MovieRenderer(this);
#else #elif !defined(QT_NO_WIDGETS)
m_videoOutput = new QT7MovieViewRenderer(this); m_videoOutput = new QT7MovieViewRenderer(this);
#else
return 0;
#endif #endif
} }
#ifndef QT_NO_WIDGETS
if (qstrcmp(name, QVideoWidgetControl_iid) == 0) { if (qstrcmp(name, QVideoWidgetControl_iid) == 0) {
#ifdef QUICKTIME_C_API_AVAILABLE #ifdef QUICKTIME_C_API_AVAILABLE
m_videoOutput = new QT7MovieVideoWidget(this); m_videoOutput = new QT7MovieVideoWidget(this);
#endif #endif
} }
#endif
if (m_videoOutput) { if (m_videoOutput) {
QT7VideoOutput *videoOutput = qobject_cast<QT7VideoOutput*>(m_videoOutput); QT7VideoOutput *videoOutput = qobject_cast<QT7VideoOutput*>(m_videoOutput);

4
src/plugins/qt7/qt7.pro
View File

@@ -46,14 +46,12 @@ OBJECTIVE_SOURCES += \
!simulator { !simulator {
HEADERS += \ HEADERS += \
qt7movieviewoutput.h \ qt7movieviewoutput.h \
qt7movieviewrenderer.h \
qt7movierenderer.h \ qt7movierenderer.h \
qt7ciimagevideobuffer.h \ qt7ciimagevideobuffer.h \
qcvdisplaylink.h qcvdisplaylink.h
OBJECTIVE_SOURCES += \ OBJECTIVE_SOURCES += \
qt7movieviewoutput.mm \ qt7movieviewoutput.mm \
qt7movieviewrenderer.mm \
qt7movierenderer.mm \ qt7movierenderer.mm \
qt7videooutput.mm \ qt7videooutput.mm \
qt7ciimagevideobuffer.mm \ qt7ciimagevideobuffer.mm \
@@ -61,9 +59,11 @@ OBJECTIVE_SOURCES += \
!isEmpty(QT.widgets.name) { !isEmpty(QT.widgets.name) {
HEADERS += \ HEADERS += \
qt7movieviewrenderer.h \
qt7movievideowidget.h qt7movievideowidget.h
OBJECTIVE_SOURCES += \ OBJECTIVE_SOURCES += \
qt7movieviewrenderer.mm \
qt7movievideowidget.mm qt7movievideowidget.mm
} }
} }

2
src/plugins/qt7/qt7movierenderer.mm
View File

@@ -51,8 +51,6 @@
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtCore/qcoreapplication.h> #include <QtCore/qcoreapplication.h>
#include <QGLWidget>
#include <qabstractvideobuffer.h> #include <qabstractvideobuffer.h>
#include <qabstractvideosurface.h> #include <qabstractvideosurface.h>
#include <qvideosurfaceformat.h> #include <qvideosurfaceformat.h>

4
src/plugins/qt7/qt7videooutput.h
View File

@@ -46,7 +46,9 @@
#include <QtCore/qsize.h> #include <QtCore/qsize.h>
#include <qvideowindowcontrol.h> #include <qvideowindowcontrol.h>
#ifndef QT_NO_WIDGETS
#include <qvideowidgetcontrol.h> #include <qvideowidgetcontrol.h>
#endif
#include <qvideorenderercontrol.h> #include <qvideorenderercontrol.h>
#include <qmediaplayer.h> #include <qmediaplayer.h>
@@ -95,6 +97,7 @@ protected:
{} {}
}; };
#ifndef QT_NO_WIDGETS
class QT7VideoWidgetControl : public QVideoWidgetControl, public QT7VideoOutput class QT7VideoWidgetControl : public QVideoWidgetControl, public QT7VideoOutput
{ {
Q_OBJECT Q_OBJECT
@@ -107,6 +110,7 @@ protected:
:QVideoWidgetControl(parent) :QVideoWidgetControl(parent)
{} {}
}; };
#endif
QT_END_NAMESPACE QT_END_NAMESPACE