diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-04-19 12:36:42 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-04-19 12:36:42 (GMT) |
| commit | 096c7d37ec67a4db7b812debed5f51737ec38900 (patch) | |
| tree | 9276b3b8d92d6b935da1b63dac352a8d96c70e58 /src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm | |
| parent | 813f10c861d14a9c2af2832f597bc3987756221d (diff) | |
| parent | 4676dd62871da2b58452ebda477a04c25158bec4 (diff) | |
| download | Qt-096c7d37ec67a4db7b812debed5f51737ec38900.zip Qt-096c7d37ec67a4db7b812debed5f51737ec38900.tar.gz Qt-096c7d37ec67a4db7b812debed5f51737ec38900.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
doc/src/template/style/style.css
tools/qdoc3/htmlgenerator.cpp
Diffstat (limited to 'src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm')
| -rw-r--r-- | src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm | 3 |
1 files changed, 3 insertions, 0 deletions
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 |