From b35ca43b5a091420825254e547e63cc9aa73dded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Thu, 8 Apr 2010 11:25:29 +0200 Subject: Compile on 10.4. (include gl.h, NSBitmapImageRep::CGImage is 10.5+ only) This commmit simply ommits calling DrawImage when compiling or running on 10.4 - clearly not the correct thing to do if we want to support Tiger. --- src/multimedia/base/qpaintervideosurface_mac.mm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/multimedia/base/qpaintervideosurface_mac.mm b/src/multimedia/base/qpaintervideosurface_mac.mm index ee03990..1154f86 100644 --- a/src/multimedia/base/qpaintervideosurface_mac.mm +++ b/src/multimedia/base/qpaintervideosurface_mac.mm @@ -53,6 +53,7 @@ #include #include +#include QT_BEGIN_NAMESPACE @@ -147,11 +148,19 @@ QAbstractVideoSurface::Error QVideoSurfaceCoreGraphicsPainter::paint( CGContextTranslateCTM(cgContext, 0, dRect.origin.y + CGRectGetMaxY(dRect)); CGContextScaleCTM(cgContext, 1, -1); +#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4) + if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_4) { CGContextDrawImage(cgContext, dRect, [bitmap CGImage]); + } +#endif CGContextRestoreGState(cgContext); } else { +#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4) + if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_4) { CGContextDrawImage(cgContext, dRect, [bitmap CGImage]); + } +#endif } [bitmap release]; -- cgit v0.12