summaryrefslogtreecommitdiffstats
path: root/src/plugins/mediaservices
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2010-04-14 07:44:50 (GMT)
committerKent Hansen <kent.hansen@nokia.com>2010-04-14 07:46:43 (GMT)
commit7e1e691d0ae3c665ecb213ce7fd0e27d9838e5a9 (patch)
tree6d85a0d74c2ce97f95eb16876f28b51ad5945535 /src/plugins/mediaservices
parenta683587a5ffd07366d60f1c4eb56aaee090fcbc4 (diff)
downloadQt-7e1e691d0ae3c665ecb213ce7fd0e27d9838e5a9.zip
Qt-7e1e691d0ae3c665ecb213ce7fd0e27d9838e5a9.tar.gz
Qt-7e1e691d0ae3c665ecb213ce7fd0e27d9838e5a9.tar.bz2
Compile on Mac OS 10.4
Reviewed-by: Morten Sørvig
Diffstat (limited to 'src/plugins/mediaservices')
-rw-r--r--src/plugins/mediaservices/qt7/qcvdisplaylink.h2
-rw-r--r--src/plugins/mediaservices/qt7/qt7ciimagevideobuffer.mm3
-rw-r--r--src/plugins/mediaservices/qt7/qt7movierenderer.h2
-rw-r--r--src/plugins/mediaservices/qt7/qt7movievideowidget.h2
-rw-r--r--src/plugins/mediaservices/qt7/qt7movieviewoutput.mm3
-rw-r--r--src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm3
6 files changed, 12 insertions, 3 deletions
diff --git a/src/plugins/mediaservices/qt7/qcvdisplaylink.h b/src/plugins/mediaservices/qt7/qcvdisplaylink.h
index 5cd8f73..5a1180d 100644
--- a/src/plugins/mediaservices/qt7/qcvdisplaylink.h
+++ b/src/plugins/mediaservices/qt7/qcvdisplaylink.h
@@ -45,7 +45,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qmutex.h>
-#include <CoreVideo/CVDisplayLink.h>
+#include <QuartzCore/CVDisplayLink.h>
QT_BEGIN_HEADER
diff --git a/src/plugins/mediaservices/qt7/qt7ciimagevideobuffer.mm b/src/plugins/mediaservices/qt7/qt7ciimagevideobuffer.mm
index 3778b58..7c02f9f 100644
--- a/src/plugins/mediaservices/qt7/qt7ciimagevideobuffer.mm
+++ b/src/plugins/mediaservices/qt7/qt7ciimagevideobuffer.mm
@@ -41,6 +41,9 @@
#include "qt7ciimagevideobuffer.h"
+#include <QuartzCore/CIFilter.h>
+#include <QuartzCore/CIVector.h>
+
QT7CIImageVideoBuffer::QT7CIImageVideoBuffer(CIImage *image)
: QAbstractVideoBuffer(CoreImageHandle)
, m_image(image)
diff --git a/src/plugins/mediaservices/qt7/qt7movierenderer.h b/src/plugins/mediaservices/qt7/qt7movierenderer.h
index c2dd177..5953b54 100644
--- a/src/plugins/mediaservices/qt7/qt7movierenderer.h
+++ b/src/plugins/mediaservices/qt7/qt7movierenderer.h
@@ -53,7 +53,7 @@
#include <QtGui/qmacdefines_mac.h>
#include "qt7videooutputcontrol.h"
-#include <CoreVideo/CVOpenGLTexture.h>
+#include <QuartzCore/CVOpenGLTexture.h>
#include <QuickTime/QuickTime.h>
diff --git a/src/plugins/mediaservices/qt7/qt7movievideowidget.h b/src/plugins/mediaservices/qt7/qt7movievideowidget.h
index 831a18d..3ff14f5 100644
--- a/src/plugins/mediaservices/qt7/qt7movievideowidget.h
+++ b/src/plugins/mediaservices/qt7/qt7movievideowidget.h
@@ -51,7 +51,7 @@
#include <QtGui/qmacdefines_mac.h>
#include "qt7videooutputcontrol.h"
-#include <CoreVideo/CVOpenGLTexture.h>
+#include <QuartzCore/CVOpenGLTexture.h>
#include <QuickTime/QuickTime.h>
diff --git a/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm b/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm
index 20f1a02..06299a3 100644
--- a/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm
+++ b/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm
@@ -48,6 +48,9 @@
#include "qt7playersession.h"
#include <QtCore/qdebug.h>
+#include <QuartzCore/CIFilter.h>
+#include <QuartzCore/CIVector.h>
+
#define VIDEO_TRANSPARENT(m) -(void)m:(NSEvent *)e{[[self superview] m:e];}
diff --git a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm
index 33a6970..5af9809 100644
--- a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm
+++ b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm
@@ -55,6 +55,9 @@
#include <QtMultimedia/qabstractvideosurface.h>
#include <QtMultimedia/qvideosurfaceformat.h>
+#include <QuartzCore/CIFilter.h>
+#include <QuartzCore/CIVector.h>
+
QT_BEGIN_NAMESPACE