From 29ae7af90a5bb86f9add481e8236b6ac91f22ad3 Mon Sep 17 00:00:00 2001
From: Justin McPherson <justin.mcpherson@nokia.com>
Date: Mon, 18 Jan 2010 12:36:30 +1000
Subject: Multimedia; fixes for linux

---
 src/multimedia/base/qmediaserviceprovider.cpp | 2 +-
 src/multimedia/base/qpaintervideosurface_p.h  | 3 +++
 src/plugins/mediaservices/mediaservices.pro   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/multimedia/base/qmediaserviceprovider.cpp b/src/multimedia/base/qmediaserviceprovider.cpp
index 37115e7..f7c4e1f 100644
--- a/src/multimedia/base/qmediaserviceprovider.cpp
+++ b/src/multimedia/base/qmediaserviceprovider.cpp
@@ -43,7 +43,7 @@
 #include <QtCore/qmap.h>
 
 #include <QtMultimedia/qmediaservice.h>
-#include <QtMUltimedia/qmediaserviceprovider.h>
+#include <QtMultimedia/qmediaserviceprovider.h>
 #include <QtMultimedia/qmediaserviceproviderplugin.h>
 #include "qmediapluginloader_p.h"
 #include <QtMultimedia/qmediaplayer.h>
diff --git a/src/multimedia/base/qpaintervideosurface_p.h b/src/multimedia/base/qpaintervideosurface_p.h
index 2a146d0..a7d3e3a 100644
--- a/src/multimedia/base/qpaintervideosurface_p.h
+++ b/src/multimedia/base/qpaintervideosurface_p.h
@@ -65,6 +65,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+class QGLContext;
+
+
 class QVideoSurfacePainter;
 class Q_AUTOTEST_EXPORT QPainterVideoSurface : public QAbstractVideoSurface
 {
diff --git a/src/plugins/mediaservices/mediaservices.pro b/src/plugins/mediaservices/mediaservices.pro
index 765477d..03859bd 100644
--- a/src/plugins/mediaservices/mediaservices.pro
+++ b/src/plugins/mediaservices/mediaservices.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
-SUBDIRS += qt7
+mac:SUBDIRS += qt7
 
 
-- 
cgit v0.12