--- a/qtmobility/src/multimedia/qmediaserviceprovider.h	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaserviceprovider.h	Wed Jun 23 19:08:38 2010 +0300
@@ -52,7 +52,7 @@
 class QMediaService;
 
 class QMediaServiceProviderHintPrivate;
-class Q_MEDIA_EXPORT QMediaServiceProviderHint
+class Q_MULTIMEDIA_EXPORT QMediaServiceProviderHint
 {
 public:
     enum Type { Null, ContentType, Device, SupportedFeatures };
@@ -93,7 +93,7 @@
     QSharedDataPointer<QMediaServiceProviderHintPrivate> d;
 };
 
-class Q_MEDIA_EXPORT QMediaServiceProvider : public QObject
+class Q_MULTIMEDIA_EXPORT QMediaServiceProvider : public QObject
 {
     Q_OBJECT
 
@@ -101,7 +101,7 @@
     virtual QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint = QMediaServiceProviderHint()) = 0;
     virtual void releaseService(QMediaService *service) = 0;
 
-    virtual QtMediaServices::SupportEstimate hasSupport(const QByteArray &serviceType,
+    virtual QtMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType,
                                              const QString &mimeType,
                                              const QStringList& codecs,
                                              int flags = 0) const;