diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-14 08:48:19 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-14 08:48:19 (GMT) |
| commit | 4ca8db7b01793a97489b75d093e289a8ec9c23a0 (patch) | |
| tree | af3b666fdf2b6887d7f10c20c1d36f84390606fa /src/plugins/mediaservices/qt7 | |
| parent | 4607210dfef3b51933f03deab1037c98cbb8869c (diff) | |
| parent | d3e91e4124b96869b8c4e2c8492b4d4cec913ebc (diff) | |
| download | Qt-4ca8db7b01793a97489b75d093e289a8ec9c23a0.zip Qt-4ca8db7b01793a97489b75d093e289a8ec9c23a0.tar.gz Qt-4ca8db7b01793a97489b75d093e289a8ec9c23a0.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/plugins/mediaservices/qt7')
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 |