diff options
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/base/qmediapluginloader.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/base/qpaintervideosurface_mac.mm | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/multimedia/base/qmediapluginloader.cpp b/src/multimedia/base/qmediapluginloader.cpp index 24c5aba..eaf6218 100644 --- a/src/multimedia/base/qmediapluginloader.cpp +++ b/src/multimedia/base/qmediapluginloader.cpp @@ -98,6 +98,7 @@ void QMediaPluginLoader::load() } } } else { +#ifndef QT_NO_LIBRARY QStringList paths = QCoreApplication::libraryPaths(); foreach (QString const &path, paths) { @@ -126,6 +127,7 @@ void QMediaPluginLoader::load() loader.unload(); } } +#endif } } 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 <QuartzCore/CIContext.h> #include <CGLCurrent.h> +#include <gl.h> 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]; |