diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-06-06 22:21:39 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-07 09:37:07 +0200 |
| commit | 2d8f81b8575d519a2642d8e09fd55af9026f9c56 (patch) | |
| tree | 1c10185448f23c1ab341f89717cfc40afd8f081f /src | |
| parent | d91d3b9b18f94c48055d770d16644bee209360c4 (diff) | |
Fix compilation without QtWidgets and QtOpenGL on Mac
Change-Id: I3cff7e41d27955e37bc8207e4820fdc21ce75f7b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qt7/mediaplayer/qt7playerservice.mm | 9 | ||||
| -rw-r--r-- | src/plugins/qt7/qt7.pro | 4 | ||||
| -rw-r--r-- | src/plugins/qt7/qt7movierenderer.mm | 2 | ||||
| -rw-r--r-- | src/plugins/qt7/qt7videooutput.h | 4 |
4 files changed, 13 insertions, 6 deletions
diff --git a/src/plugins/qt7/mediaplayer/qt7playerservice.mm b/src/plugins/qt7/mediaplayer/qt7playerservice.mm index 5b89c3806..ae7c2c882 100644 --- a/src/plugins/qt7/mediaplayer/qt7playerservice.mm +++ b/src/plugins/qt7/mediaplayer/qt7playerservice.mm @@ -41,7 +41,6 @@ #include <QtCore/qvariant.h> #include <QtCore/qdebug.h> -#include <QtWidgets/qwidget.h> #include "qt7backend.h" #include "qt7playerservice.h" @@ -51,7 +50,9 @@ #include "qt7movieviewoutput.h" #include "qt7movieviewrenderer.h" #include "qt7movierenderer.h" +#ifndef QT_NO_WIDGETS #include "qt7movievideowidget.h" +#endif #include "qt7playermetadata.h" #include <private/qmediaplaylistnavigator_p.h> @@ -95,16 +96,20 @@ QMediaControl *QT7PlayerService::requestControl(const char *name) if (qstrcmp(name, QVideoRendererControl_iid) == 0) { #ifdef QUICKTIME_C_API_AVAILABLE m_videoOutput = new QT7MovieRenderer(this); -#else +#elif !defined(QT_NO_WIDGETS) m_videoOutput = new QT7MovieViewRenderer(this); +#else + return 0; #endif } +#ifndef QT_NO_WIDGETS if (qstrcmp(name, QVideoWidgetControl_iid) == 0) { #ifdef QUICKTIME_C_API_AVAILABLE m_videoOutput = new QT7MovieVideoWidget(this); #endif } +#endif if (m_videoOutput) { QT7VideoOutput *videoOutput = qobject_cast<QT7VideoOutput*>(m_videoOutput); diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro index 83b8c13bb..2c324e02c 100644 --- a/src/plugins/qt7/qt7.pro +++ b/src/plugins/qt7/qt7.pro @@ -46,14 +46,12 @@ OBJECTIVE_SOURCES += \ !simulator { HEADERS += \ qt7movieviewoutput.h \ - qt7movieviewrenderer.h \ qt7movierenderer.h \ qt7ciimagevideobuffer.h \ qcvdisplaylink.h OBJECTIVE_SOURCES += \ qt7movieviewoutput.mm \ - qt7movieviewrenderer.mm \ qt7movierenderer.mm \ qt7videooutput.mm \ qt7ciimagevideobuffer.mm \ @@ -61,9 +59,11 @@ OBJECTIVE_SOURCES += \ !isEmpty(QT.widgets.name) { HEADERS += \ + qt7movieviewrenderer.h \ qt7movievideowidget.h OBJECTIVE_SOURCES += \ + qt7movieviewrenderer.mm \ qt7movievideowidget.mm } } diff --git a/src/plugins/qt7/qt7movierenderer.mm b/src/plugins/qt7/qt7movierenderer.mm index afddd4dd4..fbff70a20 100644 --- a/src/plugins/qt7/qt7movierenderer.mm +++ b/src/plugins/qt7/qt7movierenderer.mm @@ -51,8 +51,6 @@ #include <QtCore/qdebug.h> #include <QtCore/qcoreapplication.h> -#include <QGLWidget> - #include <qabstractvideobuffer.h> #include <qabstractvideosurface.h> #include <qvideosurfaceformat.h> diff --git a/src/plugins/qt7/qt7videooutput.h b/src/plugins/qt7/qt7videooutput.h index 242b2e425..fd255f664 100644 --- a/src/plugins/qt7/qt7videooutput.h +++ b/src/plugins/qt7/qt7videooutput.h @@ -46,7 +46,9 @@ #include <QtCore/qsize.h> #include <qvideowindowcontrol.h> +#ifndef QT_NO_WIDGETS #include <qvideowidgetcontrol.h> +#endif #include <qvideorenderercontrol.h> #include <qmediaplayer.h> @@ -95,6 +97,7 @@ protected: {} }; +#ifndef QT_NO_WIDGETS class QT7VideoWidgetControl : public QVideoWidgetControl, public QT7VideoOutput { Q_OBJECT @@ -107,6 +110,7 @@ protected: :QVideoWidgetControl(parent) {} }; +#endif QT_END_NAMESPACE |