137 files changed, 311 insertions, 262 deletions

diff --git a/src/multimedia/base/base.pri b/src/multimedia/mediaservices/base/base.pri
index 49eca49..49eca49 100644
--- a/src/multimedia/base/base.pri
+++ b/src/multimedia/mediaservices/base/base.pri
diff --git a/src/multimedia/base/qgraphicsvideoitem.cpp b/src/multimedia/mediaservices/base/qgraphicsvideoitem.cpp
index c50d3ff..d80dec5 100644
--- a/src/multimedia/base/qgraphicsvideoitem.cpp
+++ b/src/multimedia/mediaservices/base/qgraphicsvideoitem.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaservies module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/qgraphicsvideoitem.h>
+#include <QtMediaServices/qgraphicsvideoitem.h>
 
-#include <QtMultimedia/qmediaobject.h>
-#include <QtMultimedia/qmediaservice.h>
-#include <QtMultimedia/private/qpaintervideosurface_p.h>
-#include <QtMultimedia/qvideooutputcontrol.h>
-#include <QtMultimedia/qvideorenderercontrol.h>
+#include <QtMediaServices/qmediaobject.h>
+#include <QtMediaServices/qmediaservice.h>
+#include <QtMediaServices/private/qpaintervideosurface_p.h>
+#include <QtMediaServices/qvideooutputcontrol.h>
+#include <QtMediaServices/qvideorenderercontrol.h>
 #include <QtMultimedia/qvideosurfaceformat.h>
 
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
diff --git a/src/multimedia/base/qgraphicsvideoitem.h b/src/multimedia/mediaservices/base/qgraphicsvideoitem.h
index a20caf3..679b353 100644
--- a/src/multimedia/base/qgraphicsvideoitem.h
+++ b/src/multimedia/mediaservices/base/qgraphicsvideoitem.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -44,7 +44,7 @@
 
 #include <QtGui/qgraphicsitem.h>
 
-#include <QtMultimedia/qvideowidget.h>
+#include <QtMediaServices/qvideowidget.h>
 
 #if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW
 
@@ -57,7 +57,7 @@ QT_MODULE(Multimedia)
 class QVideoSurfaceFormat;
 
 class QGraphicsVideoItemPrivate;
-class Q_MULTIMEDIA_EXPORT QGraphicsVideoItem : public QGraphicsObject
+class Q_MEDIASERVICES_EXPORT QGraphicsVideoItem : public QGraphicsObject
 {
     Q_OBJECT
     Q_PROPERTY(QMediaObject* mediaObject READ mediaObject WRITE setMediaObject)
diff --git a/src/multimedia/base/qlocalmediaplaylistprovider.cpp b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.cpp
index 40ff1fc..51e3bfb 100644
--- a/src/multimedia/base/qlocalmediaplaylistprovider.cpp
+++ b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices  module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/qlocalmediaplaylistprovider.h>
+#include <QtMediaServices/qlocalmediaplaylistprovider.h>
 #include "qmediaplaylistprovider_p.h"
-#include <QtMultimedia/qmediacontent.h>
+#include <QtMediaServices/qmediacontent.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/base/qlocalmediaplaylistprovider.h b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h
index db8deb1..4dd53df 100644
--- a/src/multimedia/base/qlocalmediaplaylistprovider.h
+++ b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,7 +42,7 @@
 #ifndef QLOCALMEDIAPAYLISTPROVIDER_H
 #define QLOCALMEDIAPAYLISTPROVIDER_H
 
-#include <QtMultimedia/qmediaplaylistprovider.h>
+#include <QtMediaServices/qmediaplaylistprovider.h>
 
 QT_BEGIN_HEADER
 
@@ -52,7 +52,7 @@ QT_MODULE(Multimedia)
 
 
 class QLocalMediaPlaylistProviderPrivate;
-class Q_MULTIMEDIA_EXPORT QLocalMediaPlaylistProvider : public QMediaPlaylistProvider
+class Q_MEDIASERVICES_EXPORT QLocalMediaPlaylistProvider : public QMediaPlaylistProvider
 {
     Q_OBJECT
 
diff --git a/src/multimedia/base/qmediacontent.cpp b/src/multimedia/mediaservices/base/qmediacontent.cpp
index b6bf56b..50d8e46 100644
--- a/src/multimedia/base/qmediacontent.cpp
+++ b/src/multimedia/mediaservices/base/qmediacontent.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,7 +42,7 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
 
-#include <qmediacontent.h>
+#include <QtMediaServices/qmediacontent.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/base/qmediacontent.h b/src/multimedia/mediaservices/base/qmediacontent.h
index 5a279c1..c00e443 100644
--- a/src/multimedia/base/qmediacontent.h
+++ b/src/multimedia/mediaservices/base/qmediacontent.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -45,7 +45,7 @@
 #include <QtCore/qmetatype.h>
 #include <QtCore/qshareddata.h>
 
-#include <QtMultimedia/qmediaresource.h>
+#include <QtMediaServices/qmediaresource.h>
 #include <QtNetwork/qnetworkrequest.h>
 
 
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Multimedia)
 
 class QMediaContentPrivate;
-class Q_MULTIMEDIA_EXPORT QMediaContent
+class Q_MEDIASERVICES_EXPORT QMediaContent
 {
 public:
     QMediaContent();
diff --git a/src/multimedia/base/qmediacontrol.cpp b/src/multimedia/mediaservices/base/qmediacontrol.cpp
index b84c49e..09996c8 100644
--- a/src/multimedia/base/qmediacontrol.cpp
+++ b/src/multimedia/mediaservices/base/qmediacontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,8 +42,8 @@
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qtimer.h>
 
-#include <QtMultimedia/qmediacontrol.h>
-#include "qmediacontrol_p.h"
+#include <QtMediaServices//qmediacontrol.h>
+#include <QtMediaServices/private/qmediacontrol_p.h>
 
 
 
diff --git a/src/multimedia/base/qmediacontrol.h b/src/multimedia/mediaservices/base/qmediacontrol.h
index 8ed9fe8..941c004 100644
--- a/src/multimedia/base/qmediacontrol.h
+++ b/src/multimedia/mediaservices/base/qmediacontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Multimedia)
 
 class QMediaControlPrivate;
-class Q_MULTIMEDIA_EXPORT QMediaControl : public QObject
+class Q_MEDIASERVICES_EXPORT QMediaControl : public QObject
 {
     Q_OBJECT
 
diff --git a/src/multimedia/base/qmediacontrol_p.h b/src/multimedia/mediaservices/base/qmediacontrol_p.h
index 4d00f11..3f9755b 100644
--- a/src/multimedia/base/qmediacontrol_p.h
+++ b/src/multimedia/mediaservices/base/qmediacontrol_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/base/qmediaobject.cpp b/src/multimedia/mediaservices/base/qmediaobject.cpp
index 0422718..68fb29e 100644
--- a/src/multimedia/base/qmediaobject.cpp
+++ b/src/multimedia/mediaservices/base/qmediaobject.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaservics module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -43,8 +43,8 @@
 
 #include "qmediaobject_p.h"
 
-#include <QtMultimedia/qmediaservice.h>
-#include <QtMultimedia/qmetadatacontrol.h>
+#include <QtMediaServices/qmediaservice.h>
+#include <QtMediaServices/qmetadatacontrol.h>
 
 
 QT_BEGIN_NAMESPACE
@@ -97,9 +97,9 @@ QMediaObject::~QMediaObject()
     Returns the service availability error state.
 */
 
-QtMultimedia::AvailabilityError QMediaObject::availabilityError() const
+QtMediaServices::AvailabilityError QMediaObject::availabilityError() const
 {
-    return QtMultimedia::ServiceMissingError;
+    return QtMediaServices::ServiceMissingError;
 }
 
 /*!
@@ -306,7 +306,7 @@ bool QMediaObject::isMetaDataWritable() const
 /*!
     Returns the value associated with a meta-data \a key.
 */
-QVariant QMediaObject::metaData(QtMultimedia::MetaData key) const
+QVariant QMediaObject::metaData(QtMediaServices::MetaData key) const
 {
     Q_D(const QMediaObject);
 
@@ -318,7 +318,7 @@ QVariant QMediaObject::metaData(QtMultimedia::MetaData key) const
 /*!
     Sets a \a value for a meta-data \a key.
 */
-void QMediaObject::setMetaData(QtMultimedia::MetaData key, const QVariant &value)
+void QMediaObject::setMetaData(QtMediaServices::MetaData key, const QVariant &value)
 {
     Q_D(QMediaObject);
 
@@ -329,13 +329,13 @@ void QMediaObject::setMetaData(QtMultimedia::MetaData key, const QVariant &value
 /*!
     Returns a list of keys there is meta-data available for.
 */
-QList<QtMultimedia::MetaData> QMediaObject::availableMetaData() const
+QList<QtMediaServices::MetaData> QMediaObject::availableMetaData() const
 {
     Q_D(const QMediaObject);
 
     return d->metaDataControl
             ? d->metaDataControl->availableMetaData()
-            : QList<QtMultimedia::MetaData>();
+            : QList<QtMediaServices::MetaData>();
 }
 
 /*!
diff --git a/src/multimedia/base/qmediaobject.h b/src/multimedia/mediaservices/base/qmediaobject.h
index d09b1af..067bb56 100644
--- a/src/multimedia/base/qmediaobject.h
+++ b/src/multimedia/mediaservices/base/qmediaobject.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qstringlist.h>
 
-#include <QtMultimedia/qtmedianamespace.h>
+#include <QtMediaServices/qtmedianamespace.h>
 
 QT_BEGIN_HEADER
 
@@ -56,7 +56,7 @@ QT_MODULE(Multimedia)
 class QMediaService;
 
 class QMediaObjectPrivate;
-class Q_MULTIMEDIA_EXPORT QMediaObject : public QObject
+class Q_MEDIASERVICES_EXPORT QMediaObject : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int notifyInterval READ notifyInterval WRITE setNotifyInterval NOTIFY notifyIntervalChanged)
@@ -67,7 +67,7 @@ public:
     ~QMediaObject();
 
     virtual bool isAvailable() const;
-    virtual QtMultimedia::AvailabilityError availabilityError() const;
+    virtual QtMediaServices::AvailabilityError availabilityError() const;
 
     virtual QMediaService* service() const;
 
@@ -80,9 +80,9 @@ public:
     bool isMetaDataAvailable() const;
     bool isMetaDataWritable() const;
 
-    QVariant metaData(QtMultimedia::MetaData key) const;
-    void setMetaData(QtMultimedia::MetaData key, const QVariant &value);
-    QList<QtMultimedia::MetaData> availableMetaData() const;
+    QVariant metaData(QtMediaServices::MetaData key) const;
+    void setMetaData(QtMediaServices::MetaData key, const QVariant &value);
+    QList<QtMediaServices::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const;
     void setExtendedMetaData(const QString &key, const QVariant &value);
diff --git a/src/multimedia/base/qmediaobject_p.h b/src/multimedia/mediaservices/base/qmediaobject_p.h
index ec2f75a..c31ad46 100644
--- a/src/multimedia/base/qmediaobject_p.h
+++ b/src/multimedia/mediaservices/base/qmediaobject_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -57,7 +57,7 @@
 #include <QtCore/qset.h>
 #include <QtCore/qtimer.h>
 
-#include <QtMultimedia/qmediaobject.h>
+#include <QtMediaServices/qmediaobject.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/base/qmediaplaylist.cpp b/src/multimedia/mediaservices/base/qmediaplaylist.cpp
index b3f3dd3..93278fe 100644
--- a/src/multimedia/base/qmediaplaylist.cpp
+++ b/src/multimedia/mediaservices/base/qmediaplaylist.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -45,14 +45,14 @@
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qcoreapplication.h>
 
-#include <QtMultimedia/qmediaplaylist.h>
+#include <QtMediaServices/qmediaplaylist.h>
 #include "qmediaplaylist_p.h"
-#include <QtMultimedia/qmediaplaylistprovider.h>
-#include <QtMultimedia/qlocalmediaplaylistprovider.h>
-#include <QtMultimedia/qmediaplaylistioplugin.h>
-#include <QtMultimedia/qmediaservice.h>
-#include <QtMultimedia/qmediaplaylistcontrol.h>
-#include <QtMultimedia/qmediaplayercontrol.h>
+#include <QtMediaServices/qmediaplaylistprovider.h>
+#include <QtMediaServices/qlocalmediaplaylistprovider.h>
+#include <QtMediaServices/qmediaplaylistioplugin.h>
+#include <QtMediaServices/qmediaservice.h>
+#include <QtMediaServices/qmediaplaylistcontrol.h>
+#include <QtMediaServices/qmediaplayercontrol.h>
 
 #include "qmediapluginloader_p.h"
 
diff --git a/src/multimedia/base/qmediaplaylist.h b/src/multimedia/mediaservices/base/qmediaplaylist.h
index 494cf11..6cae7c5 100644
--- a/src/multimedia/base/qmediaplaylist.h
+++ b/src/multimedia/mediaservices/base/qmediaplaylist.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -44,8 +44,8 @@
 
 #include <QtCore/qobject.h>
 
-#include <QtMultimedia/qmediacontent.h>
-#include <QtMultimedia/qmediaobject.h>
+#include <QtMediaServices/qmediacontent.h>
+#include <QtMediaServices/qmediaobject.h>
 
 
 QT_BEGIN_HEADER
@@ -57,7 +57,7 @@ QT_MODULE(Multimedia)
 class QMediaPlaylistProvider;
 
 class QMediaPlaylistPrivate;
-class Q_MULTIMEDIA_EXPORT QMediaPlaylist : public QObject
+class Q_MEDIASERVICES_EXPORT QMediaPlaylist : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QMediaPlaylist::PlaybackMode playbackMode READ playbackMode WRITE setPlaybackMode NOTIFY playbackModeChanged)
diff --git a/src/multimedia/base/qmediaplaylist_p.h b/src/multimedia/mediaservices/base/qmediaplaylist_p.h
index da529b7..a5f290e 100644
--- a/src/multimedia/base/qmediaplaylist_p.h
+++ b/src/multimedia/mediaservices/base/qmediaplaylist_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -53,11 +53,11 @@
 // We mean it.
 //
 
-#include <QtMultimedia/qmediaplaylist.h>
-#include <QtMultimedia/qmediaplaylistcontrol.h>
-#include <QtMultimedia/qmediaplayer.h>
-#include <QtMultimedia/qmediaplayercontrol.h>
-#include <QtMultimedia/qlocalmediaplaylistprovider.h>
+#include <QtMediaServices/qmediaplaylist.h>
+#include <QtMediaServices/qmediaplaylistcontrol.h>
+#include <QtMediaServices/qmediaplayer.h>
+#include <QtMediaServices/qmediaplayercontrol.h>
+#include <QtMediaServices/qlocalmediaplaylistprovider.h>
 #include "qmediaobject_p.h"
 
 #include <QtCore/qdebug.h>
diff --git a/src/multimedia/base/qmediaplaylistcontrol.cpp b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.cpp
index ba3d224..016c55d 100644
--- a/src/multimedia/base/qmediaplaylistcontrol.cpp
+++ b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 
-#include <QtMultimedia/qmediaplaylistcontrol.h>
+#include <QtMediaServices/qmediaplaylistcontrol.h>
 #include "qmediacontrol_p.h"
 
 
diff --git a/src/multimedia/base/qmediaplaylistcontrol.h b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h
index 228ee19..2dc4575 100644
--- a/src/multimedia/base/qmediaplaylistcontrol.h
+++ b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -43,8 +43,8 @@
 #ifndef QMEDIAPLAYLISTCONTROL_H
 #define QMEDIAPLAYLISTCONTROL_H
 
-#include <QtMultimedia/qmediacontrol.h>
-#include <QtMultimedia/qmediaplaylistnavigator.h>
+#include <QtMediaServices/qmediacontrol.h>
+#include <QtMediaServices/qmediaplaylistnavigator.h>
 
 
 QT_BEGIN_HEADER
@@ -56,7 +56,7 @@ QT_MODULE(Multimedia)
 
 class QMediaPlaylistProvider;
 
-class Q_MULTIMEDIA_EXPORT QMediaPlaylistControl : public QMediaControl
+class Q_MEDIASERVICES_EXPORT QMediaPlaylistControl : public QMediaControl
 {
     Q_OBJECT
 
diff --git a/src/multimedia/base/qmediaplaylistioplugin.cpp b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.cpp
index 48fd721..60e80e5 100644
--- a/src/multimedia/base/qmediaplaylistioplugin.cpp
+++ b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/qmediaplaylistioplugin.h>
+#include <QtMediaServices/qmediaplaylistioplugin.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/base/qmediaplaylistioplugin.h b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h
index e55298d..ed8e832 100644
--- a/src/multimedia/base/qmediaplaylistioplugin.h
+++ b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -46,7 +46,7 @@
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
 
-#include <QtMultimedia/qmediacontent.h>
+#include <QtMediaServices/qmediacontent.h>
 
 
 QT_BEGIN_HEADER
@@ -62,7 +62,7 @@ class QByteArray;
 class QIODevice;
 class QStringList;
 
-class Q_MULTIMEDIA_EXPORT QMediaPlaylistReader
+class Q_MEDIASERVICES_EXPORT QMediaPlaylistReader
 {
 public:
     virtual ~QMediaPlaylistReader();
@@ -72,7 +72,7 @@ public:
     virtual void close() = 0;
 };
 
-class Q_MULTIMEDIA_EXPORT QMediaPlaylistWriter
+class Q_MEDIASERVICES_EXPORT QMediaPlaylistWriter
 {
 public:
     virtual ~QMediaPlaylistWriter();
@@ -81,7 +81,7 @@ public:
     virtual void close() = 0;
 };
 
-struct Q_MULTIMEDIA_EXPORT QMediaPlaylistIOInterface : public QFactoryInterface
+struct Q_MEDIASERVICES_EXPORT QMediaPlaylistIOInterface : public QFactoryInterface
 {
     virtual bool canRead(QIODevice *device, const QByteArray &format = QByteArray() ) const = 0;
     virtual bool canRead(const QUrl& location, const QByteArray &format = QByteArray()) const = 0;
@@ -97,7 +97,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaPlaylistIOInterface : public QFactoryInterface
 #define QMediaPlaylistIOInterface_iid "com.nokia.Qt.QMediaPlaylistIOInterface"
 Q_DECLARE_INTERFACE(QMediaPlaylistIOInterface, QMediaPlaylistIOInterface_iid);
 
-class Q_MULTIMEDIA_EXPORT QMediaPlaylistIOPlugin : public QObject, public QMediaPlaylistIOInterface
+class Q_MEDIASERVICES_EXPORT QMediaPlaylistIOPlugin : public QObject, public QMediaPlaylistIOInterface
 {
     Q_OBJECT
     Q_INTERFACES(QMediaPlaylistIOInterface:QFactoryInterface)
diff --git a/src/multimedia/base/qmediaplaylistnavigator.cpp b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.cpp
index 0c52c71..e3eec5e 100644
--- a/src/multimedia/base/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/qmediaplaylistnavigator.h>
-#include <QtMultimedia/qmediaplaylistprovider.h>
-#include <QtMultimedia/qmediaplaylist.h>
+#include <QtMediaServices/qmediaplaylistnavigator.h>
+#include <QtMediaServices/qmediaplaylistprovider.h>
+#include <QtMediaServices/qmediaplaylist.h>
 #include "qmediaobject_p.h"
 
 #include <QtCore/qdebug.h>
diff --git a/src/multimedia/base/qmediaplaylistnavigator.h b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h
index 73789af..42c76f9 100644
--- a/src/multimedia/base/qmediaplaylistnavigator.h
+++ b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -44,8 +44,8 @@
 
 #include <QtCore/qobject.h>
 
-#include <QtMultimedia/qmediaplaylistprovider.h>
-#include <QtMultimedia/qmediaplaylist.h>
+#include <QtMediaServices/qmediaplaylistprovider.h>
+#include <QtMediaServices/qmediaplaylist.h>
 
 
 QT_BEGIN_HEADER
@@ -56,7 +56,7 @@ QT_MODULE(Multimedia)
 
 
 class QMediaPlaylistNavigatorPrivate;
-class Q_MULTIMEDIA_EXPORT QMediaPlaylistNavigator : public QObject
+class Q_MEDIASERVICES_EXPORT QMediaPlaylistNavigator : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QMediaPlaylist::PlaybackMode playbackMode READ playbackMode WRITE setPlaybackMode NOTIFY playbackModeChanged)
diff --git a/src/multimedia/base/qmediaplaylistprovider.cpp b/src/multimedia/mediaservices/base/qmediaplaylistprovider.cpp
index 942f155..3cd766b 100644
--- a/src/multimedia/base/qmediaplaylistprovider.cpp
+++ b/src/multimedia/mediaservices/base/qmediaplaylistprovider.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -41,7 +41,7 @@
 
 #include <QtCore/qurl.h>
 
-#include <QtMultimedia/qmediaplaylistprovider.h>
+#include <QtMediaServices/qmediaplaylistprovider.h>
 #include "qmediaplaylistprovider_p.h"
 
 
diff --git a/src/multimedia/base/qmediaplaylistprovider.h b/src/multimedia/mediaservices/base/qmediaplaylistprovider.h
index b8f07d1..c68ed89 100644
--- a/src/multimedia/base/qmediaplaylistprovider.h
+++ b/src/multimedia/mediaservices/base/qmediaplaylistprovider.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -44,8 +44,8 @@
 
 #include <QtCore/qobject.h>
 
-#include <QtMultimedia/qmediacontent.h>
-#include <QtMultimedia/qmediaplaylist.h>
+#include <QtMediaServices/qmediacontent.h>
+#include <QtMediaServices/qmediaplaylist.h>
 
 
 QT_BEGIN_HEADER
@@ -58,7 +58,7 @@ class QString;
 
 
 class QMediaPlaylistProviderPrivate;
-class Q_MULTIMEDIA_EXPORT QMediaPlaylistProvider : public QObject
+class Q_MEDIASERVICES_EXPORT QMediaPlaylistProvider : public QObject
 {
     Q_OBJECT
 
diff --git a/src/multimedia/base/qmediaplaylistprovider_p.h b/src/multimedia/mediaservices/base/qmediaplaylistprovider_p.h
index aaf6deb..00d1cca 100644
--- a/src/multimedia/base/qmediaplaylistprovider_p.h
+++ b/src/multimedia/mediaservices/base/qmediaplaylistprovider_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtMultimedia/qmediaplaylist.h>
+#include <QtMediaServices/qmediaplaylist.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/base/qmediapluginloader.cpp b/src/multimedia/mediaservices/base/qmediapluginloader.cpp
index eaf6218..d6da0ba 100644
--- a/src/multimedia/base/qmediapluginloader.cpp
+++ b/src/multimedia/mediaservices/base/qmediapluginloader.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -45,7 +45,7 @@
 #include <QtCore/qdir.h>
 #include <QtCore/qdebug.h>
 
-#include <QtMultimedia/qmediaserviceproviderplugin.h>
+#include <QtMediaServices/qmediaserviceproviderplugin.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/base/qmediapluginloader_p.h b/src/multimedia/mediaservices/base/qmediapluginloader_p.h
index 351d2f1..d911180 100644
--- a/src/multimedia/base/qmediapluginloader_p.h
+++ b/src/multimedia/mediaservices/base/qmediapluginloader_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/base/qmediaresource.cpp b/src/multimedia/mediaservices/base/qmediaresource.cpp
index 646d9a7..33bd396 100644
--- a/src/multimedia/base/qmediaresource.cpp
+++ b/src/multimedia/mediaservices/base/qmediaresource.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -43,7 +43,7 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
 
-#include <QtMultimedia/qmediaresource.h>
+#include <QtMediaServices/qmediaresource.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/base/qmediaresource.h b/src/multimedia/mediaservices/base/qmediaresource.h
index a535bbd..0ecf008 100644
--- a/src/multimedia/base/qmediaresource.h
+++ b/src/multimedia/mediaservices/base/qmediaresource.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Multimedia)
 
 
-class Q_MULTIMEDIA_EXPORT QMediaResource
+class Q_MEDIASERVICES_EXPORT QMediaResource
 {
 public:
     QMediaResource();
diff --git a/src/multimedia/base/qmediaservice.cpp b/src/multimedia/mediaservices/base/qmediaservice.cpp
index d9e980b..b343887 100644
--- a/src/multimedia/base/qmediaservice.cpp
+++ b/src/multimedia/mediaservices/base/qmediaservice.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -41,7 +41,7 @@
 
 #include <QtCore/qtimer.h>
 
-#include <QtMultimedia/qmediaservice.h>
+#include <QtMediaServices/qmediaservice.h>
 #include "qmediaservice_p.h"
 
 
diff --git a/src/multimedia/base/qmediaservice.h b/src/multimedia/mediaservices/base/qmediaservice.h
index c53a15f..5df3fd7 100644
--- a/src/multimedia/base/qmediaservice.h
+++ b/src/multimedia/mediaservices/base/qmediaservice.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qstringlist.h>
 
-#include <QtMultimedia/qmediacontrol.h>
+#include <QtMediaServices/qmediacontrol.h>
 
 QT_BEGIN_HEADER
 
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Multimedia)
 
 class QMediaServicePrivate;
-class Q_MULTIMEDIA_EXPORT QMediaService : public QObject
+class Q_MEDIASERVICES_EXPORT QMediaService : public QObject
 {
     Q_OBJECT
 
diff --git a/src/multimedia/base/qmediaservice_p.h b/src/multimedia/mediaservices/base/qmediaservice_p.h
index 7dbcd8a..bebae11 100644
--- a/src/multimedia/base/qmediaservice_p.h
+++ b/src/multimedia/mediaservices/base/qmediaservice_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/base/qmediaserviceprovider.cpp b/src/multimedia/mediaservices/base/qmediaserviceprovider.cpp
index b089b39..f27628b 100644
--- a/src/multimedia/base/qmediaserviceprovider.cpp
+++ b/src/multimedia/mediaservices/base/qmediaserviceprovider.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,11 +42,11 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qmap.h>
 
-#include <QtMultimedia/qmediaservice.h>
-#include <QtMultimedia/qmediaserviceprovider.h>
-#include <QtMultimedia/qmediaserviceproviderplugin.h>
+#include <QtMediaServices/qmediaservice.h>
+#include <QtMediaServices/qmediaserviceprovider.h>
+#include <QtMediaServices/qmediaserviceproviderplugin.h>
 #include "qmediapluginloader_p.h"
-#include <QtMultimedia/qmediaplayer.h>
+#include <QtMediaServices/qmediaplayer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -337,9 +337,9 @@ public:
                 }
                 break;
             case QMediaServiceProviderHint::ContentType: {
-                    QtMultimedia::SupportEstimate estimate = QtMultimedia::NotSupported;
+                    QtMediaServices::SupportEstimate estimate = QtMediaServices::NotSupported;
                     foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) {
-                        QtMultimedia::SupportEstimate currentEstimate = QtMultimedia::MaybeSupported;
+                        QtMediaServices::SupportEstimate currentEstimate = QtMediaServices::MaybeSupported;
                         QMediaServiceSupportedFormatsInterface *iface =
                                 qobject_cast<QMediaServiceSupportedFormatsInterface*>(currentPlugin);
 
@@ -350,7 +350,7 @@ public:
                             estimate = currentEstimate;
                             plugin = currentPlugin;
 
-                            if (currentEstimate == QtMultimedia::PreferredService)
+                            if (currentEstimate == QtMediaServices::PreferredService)
                                 break;
                         }
                     }
@@ -381,7 +381,7 @@ public:
         }
     }
 
-    QtMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType,
+    QtMediaServices::SupportEstimate hasSupport(const QByteArray &serviceType,
                                      const QString &mimeType,
                                      const QStringList& codecs,
                                      int flags) const
@@ -390,10 +390,10 @@ public:
                 QString::fromLatin1(serviceType.constData(),serviceType.length()));
 
         if (instances.isEmpty())
-            return QtMultimedia::NotSupported;
+            return QtMediaServices::NotSupported;
 
         bool allServicesProvideInterface = true;
-        QtMultimedia::SupportEstimate supportEstimate = QtMultimedia::NotSupported;
+        QtMediaServices::SupportEstimate supportEstimate = QtMediaServices::NotSupported;
 
         foreach(QObject *obj, instances) {
             QMediaServiceSupportedFormatsInterface *iface =
@@ -427,12 +427,12 @@ public:
         }
 
         //don't return PreferredService
-        supportEstimate = qMin(supportEstimate, QtMultimedia::ProbablySupported);
+        supportEstimate = qMin(supportEstimate, QtMediaServices::ProbablySupported);
 
         //Return NotSupported only if no services are available of serviceType
         //or all the services returned NotSupported, otherwise return at least MaybeSupported
         if (!allServicesProvideInterface)
-            supportEstimate = qMax(QtMultimedia::MaybeSupported, supportEstimate);
+            supportEstimate = qMax(QtMediaServices::MaybeSupported, supportEstimate);
 
         return supportEstimate;
     }
@@ -540,13 +540,13 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider);
 */
 
 /*!
-    \fn QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const
+    \fn QtMediaServices::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const
 
     Returns how confident a media service provider is that is can provide a \a serviceType
     service that is able to play media of a specific \a mimeType that is encoded using the listed
     \a codecs while adhearing to constraints identified in \a flags.
 */
-QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType,
+QtMediaServices::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType,
                                                         const QString &mimeType,
                                                         const QStringList& codecs,
                                                         int flags) const
@@ -556,7 +556,7 @@ QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray
     Q_UNUSED(codecs);
     Q_UNUSED(flags);
 
-    return QtMultimedia::MaybeSupported;
+    return QtMediaServices::MaybeSupported;
 }
 
 /*!
diff --git a/src/multimedia/base/qmediaserviceprovider.h b/src/multimedia/mediaservices/base/qmediaserviceprovider.h
index 6e31493..eeea5d2 100644
--- a/src/multimedia/base/qmediaserviceprovider.h
+++ b/src/multimedia/mediaservices/base/qmediaserviceprovider.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qshareddata.h>
 
-#include <QtMultimedia/qtmedianamespace.h>
+#include <QtMediaServices/qtmedianamespace.h>
 
 QT_BEGIN_HEADER
 
@@ -57,7 +57,7 @@ QT_MODULE(Multimedia)
 class QMediaService;
 
 class QMediaServiceProviderHintPrivate;
-class Q_MULTIMEDIA_EXPORT QMediaServiceProviderHint
+class Q_MEDIASERVICES_EXPORT QMediaServiceProviderHint
 {
 public:
     enum Type { Null, ContentType, Device, SupportedFeatures };
@@ -98,7 +98,7 @@ private:
     QSharedDataPointer<QMediaServiceProviderHintPrivate> d;
 };
 
-class Q_MULTIMEDIA_EXPORT QMediaServiceProvider : public QObject
+class Q_MEDIASERVICES_EXPORT QMediaServiceProvider : public QObject
 {
     Q_OBJECT
 
@@ -106,7 +106,7 @@ public:
     virtual QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint = QMediaServiceProviderHint()) = 0;
     virtual void releaseService(QMediaService *service) = 0;
 
-    virtual QtMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType,
+    virtual QtMediaServices::SupportEstimate hasSupport(const QByteArray &serviceType,
                                              const QString &mimeType,
                                              const QStringList& codecs,
                                              int flags = 0) const;
diff --git a/src/multimedia/base/qmediaserviceproviderplugin.h b/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h
index b1e728b..ca25f91 100644
--- a/src/multimedia/base/qmediaserviceproviderplugin.h
+++ b/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -46,7 +46,7 @@
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
 
-#include <QtMultimedia/qmediaserviceprovider.h>
+#include <QtMediaServices/qmediaserviceprovider.h>
 
 #ifdef Q_MOC_RUN
 # pragma Q_MOC_EXPAND_MACROS
@@ -61,7 +61,7 @@ QT_MODULE(Multimedia)
 class QMediaService;
 
 
-struct Q_MULTIMEDIA_EXPORT QMediaServiceProviderFactoryInterface : public QFactoryInterface
+struct Q_MEDIASERVICES_EXPORT QMediaServiceProviderFactoryInterface : public QFactoryInterface
 {
     virtual QStringList keys() const = 0;
     virtual QMediaService* create(QString const& key) = 0;
@@ -73,10 +73,10 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceProviderFactoryInterface : public QFacto
 Q_DECLARE_INTERFACE(QMediaServiceProviderFactoryInterface, QMediaServiceProviderFactoryInterface_iid)
 
 
-struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedFormatsInterface
+struct Q_MEDIASERVICES_EXPORT QMediaServiceSupportedFormatsInterface
 {
     virtual ~QMediaServiceSupportedFormatsInterface() {}
-    virtual QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0;
+    virtual QtMediaServices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0;
     virtual QStringList supportedMimeTypes() const = 0;
 };
 
@@ -85,7 +85,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedFormatsInterface
 Q_DECLARE_INTERFACE(QMediaServiceSupportedFormatsInterface, QMediaServiceSupportedFormatsInterface_iid)
 
 
-struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedDevicesInterface
+struct Q_MEDIASERVICES_EXPORT QMediaServiceSupportedDevicesInterface
 {
     virtual ~QMediaServiceSupportedDevicesInterface() {}
     virtual QList<QByteArray> devices(const QByteArray &service) const = 0;
@@ -97,7 +97,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedDevicesInterface
 Q_DECLARE_INTERFACE(QMediaServiceSupportedDevicesInterface, QMediaServiceSupportedDevicesInterface_iid)
 
 
-struct Q_MULTIMEDIA_EXPORT QMediaServiceFeaturesInterface
+struct Q_MEDIASERVICES_EXPORT QMediaServiceFeaturesInterface
 {
     virtual ~QMediaServiceFeaturesInterface() {}
     virtual QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const = 0;
@@ -107,7 +107,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceFeaturesInterface
     "com.nokia.Qt.QMediaServiceFeaturesInterface/1.0"
 Q_DECLARE_INTERFACE(QMediaServiceFeaturesInterface, QMediaServiceFeaturesInterface_iid)
 
-class Q_MULTIMEDIA_EXPORT QMediaServiceProviderPlugin : public QObject, public QMediaServiceProviderFactoryInterface
+class Q_MEDIASERVICES_EXPORT QMediaServiceProviderPlugin : public QObject, public QMediaServiceProviderFactoryInterface
 {
     Q_OBJECT
     Q_INTERFACES(QMediaServiceProviderFactoryInterface:QFactoryInterface)
diff --git a/src/multimedia/base/qmediatimerange.cpp b/src/multimedia/mediaservices/base/qmediatimerange.cpp
index e1cea7e..2dba20c 100644
--- a/src/multimedia/base/qmediatimerange.cpp
+++ b/src/multimedia/mediaservices/base/qmediatimerange.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/qmediatimerange.h>
+#include <QtMediaServices/qmediatimerange.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/base/qmediatimerange.h b/src/multimedia/mediaservices/base/qmediatimerange.h
index a65629e..5983db2 100644
--- a/src/multimedia/base/qmediatimerange.h
+++ b/src/multimedia/mediaservices/base/qmediatimerange.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -43,7 +43,7 @@
 #define QMEDIATIMERANGE_H
 
 #include <QtCore/qshareddata.h>
-#include <QtMultimedia/qtmedianamespace.h>
+#include <QtMediaServices/qtmedianamespace.h>
 
 
 QT_BEGIN_HEADER
@@ -54,7 +54,7 @@ QT_MODULE(Multimedia)
 
 class QMediaTimeRangePrivate;
 
-class Q_MULTIMEDIA_EXPORT QMediaTimeInterval
+class Q_MEDIASERVICES_EXPORT QMediaTimeInterval
 {
 public:
     QMediaTimeInterval();
@@ -78,10 +78,10 @@ private:
     qint64 e;
 };
 
-Q_MULTIMEDIA_EXPORT bool operator==(const QMediaTimeInterval&, const QMediaTimeInterval&);
-Q_MULTIMEDIA_EXPORT bool operator!=(const QMediaTimeInterval&, const QMediaTimeInterval&);
+Q_MEDIASERVICES_EXPORT bool operator==(const QMediaTimeInterval&, const QMediaTimeInterval&);
+Q_MEDIASERVICES_EXPORT bool operator!=(const QMediaTimeInterval&, const QMediaTimeInterval&);
 
-class Q_MULTIMEDIA_EXPORT QMediaTimeRange
+class Q_MEDIASERVICES_EXPORT QMediaTimeRange
 {
 public:
 
@@ -122,10 +122,10 @@ private:
     QSharedDataPointer<QMediaTimeRangePrivate> d;
 };
 
-Q_MULTIMEDIA_EXPORT bool operator==(const QMediaTimeRange&, const QMediaTimeRange&);
-Q_MULTIMEDIA_EXPORT bool operator!=(const QMediaTimeRange&, const QMediaTimeRange&);
-Q_MULTIMEDIA_EXPORT QMediaTimeRange operator+(const QMediaTimeRange&, const QMediaTimeRange&);
-Q_MULTIMEDIA_EXPORT QMediaTimeRange operator-(const QMediaTimeRange&, const QMediaTimeRange&);
+Q_MEDIASERVICES_EXPORT bool operator==(const QMediaTimeRange&, const QMediaTimeRange&);
+Q_MEDIASERVICES_EXPORT bool operator!=(const QMediaTimeRange&, const QMediaTimeRange&);
+Q_MEDIASERVICES_EXPORT QMediaTimeRange operator+(const QMediaTimeRange&, const QMediaTimeRange&);
+Q_MEDIASERVICES_EXPORT QMediaTimeRange operator-(const QMediaTimeRange&, const QMediaTimeRange&);
 
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/base/qmetadatacontrol.cpp b/src/multimedia/mediaservices/base/qmetadatacontrol.cpp
index 28a82ec..8bfec7e 100644
--- a/src/multimedia/base/qmetadatacontrol.cpp
+++ b/src/multimedia/mediaservices/base/qmetadatacontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/qmetadatacontrol.h>
+#include <QtMediaServices/qmetadatacontrol.h>
 #include "qmediacontrol_p.h"
 
 
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
     its current media it will implement QMetaDataControl.  This control
     provides functions for both retrieving and setting meta-data values.
     Meta-data may be addressed by the well defined keys in the
-    QtMultimedia::MetaData enumeration using the metaData() functions, or by
+    QtMediaServices::MetaData enumeration using the metaData() functions, or by
     string keys using the extendedMetaData() functions.
 
     The functionality provided by this control is exposed to application
@@ -117,13 +117,13 @@ QMetaDataControl::~QMetaDataControl()
 */
 
 /*!
-    \fn QVariant QMetaDataControl::metaData(QtMultimedia::MetaData key) const
+    \fn QVariant QMetaDataControl::metaData(QtMediaServices::MetaData key) const
 
     Returns the meta-data for the given \a key.
 */
 
 /*!
-    \fn void QMetaDataControl::setMetaData(QtMultimedia::MetaData key, const QVariant &value)
+    \fn void QMetaDataControl::setMetaData(QtMediaServices::MetaData key, const QVariant &value)
 
     Sets the \a value of the meta-data element with the given \a key.
 */
diff --git a/src/multimedia/base/qmetadatacontrol.h b/src/multimedia/mediaservices/base/qmetadatacontrol.h
index 8e18c16..48206fa 100644
--- a/src/multimedia/base/qmetadatacontrol.h
+++ b/src/multimedia/mediaservices/base/qmetadatacontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,9 +42,9 @@
 #ifndef QMETADATACONTROL_H
 #define QMETADATACONTROL_H
 
-#include <QtMultimedia/qmediacontrol.h>
-#include <QtMultimedia/qmediaobject.h>
-#include <QtMultimedia/qmediaresource.h>
+#include <QtMediaServices/qmediacontrol.h>
+#include <QtMediaServices/qmediaobject.h>
+#include <QtMediaServices/qmediaresource.h>
 
 
 QT_BEGIN_HEADER
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Multimedia)
 
-class Q_MULTIMEDIA_EXPORT QMetaDataControl : public QMediaControl
+class Q_MEDIASERVICES_EXPORT QMetaDataControl : public QMediaControl
 {
     Q_OBJECT
 
@@ -63,9 +63,9 @@ public:
     virtual bool isWritable() const = 0;
     virtual bool isMetaDataAvailable() const = 0;
 
-    virtual QVariant metaData(QtMultimedia::MetaData key) const = 0;
-    virtual void setMetaData(QtMultimedia::MetaData key, const QVariant &value) = 0;
-    virtual QList<QtMultimedia::MetaData> availableMetaData() const = 0;
+    virtual QVariant metaData(QtMediaServices::MetaData key) const = 0;
+    virtual void setMetaData(QtMediaServices::MetaData key, const QVariant &value) = 0;
+    virtual QList<QtMediaServices::MetaData> availableMetaData() const = 0;
 
     virtual QVariant extendedMetaData(const QString &key) const = 0;
     virtual void setExtendedMetaData(const QString &key, const QVariant &value) = 0;
diff --git a/src/multimedia/base/qpaintervideosurface.cpp b/src/multimedia/mediaservices/base/qpaintervideosurface.cpp
index 2fe941b..302e772 100644
--- a/src/multimedia/base/qpaintervideosurface.cpp
+++ b/src/multimedia/mediaservices/base/qpaintervideosurface.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/base/qpaintervideosurface_mac.mm b/src/multimedia/mediaservices/base/qpaintervideosurface_mac.mm
index 1154f86..1154f86 100644
--- a/src/multimedia/base/qpaintervideosurface_mac.mm
+++ b/src/multimedia/mediaservices/base/qpaintervideosurface_mac.mm
diff --git a/src/multimedia/base/qpaintervideosurface_mac_p.h b/src/multimedia/mediaservices/base/qpaintervideosurface_mac_p.h
index 64442ed..4f8a7a6 100644
--- a/src/multimedia/base/qpaintervideosurface_mac_p.h
+++ b/src/multimedia/mediaservices/base/qpaintervideosurface_mac_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/base/qpaintervideosurface_p.h b/src/multimedia/mediaservices/base/qpaintervideosurface_p.h
index caba3ba..07b7e01 100644
--- a/src/multimedia/base/qpaintervideosurface_p.h
+++ b/src/multimedia/mediaservices/base/qpaintervideosurface_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -89,7 +89,7 @@ public:
     virtual void updateColors(int brightness, int contrast, int hue, int saturation) = 0;
 };
 
-class Q_MULTIMEDIA_EXPORT QPainterVideoSurface : public QAbstractVideoSurface
+class Q_MEDIASERVICES_EXPORT QPainterVideoSurface : public QAbstractVideoSurface
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/base/qtmedianamespace.h b/src/multimedia/mediaservices/base/qtmedianamespace.h
index 1e04da8..917c646 100644
--- a/src/multimedia/base/qtmedianamespace.h
+++ b/src/multimedia/mediaservices/base/qtmedianamespace.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Multimedia)
 
-namespace QtMultimedia
+namespace QtMediaServices
 {
     enum MetaData
     {
diff --git a/src/multimedia/base/qtmedianamespace.qdoc b/src/multimedia/mediaservices/base/qtmedianamespace.qdoc
index 277b1a5..277b1a5 100644
--- a/src/multimedia/base/qtmedianamespace.qdoc
+++ b/src/multimedia/mediaservices/base/qtmedianamespace.qdoc
diff --git a/src/multimedia/base/qvideodevicecontrol.cpp b/src/multimedia/mediaservices/base/qvideodevicecontrol.cpp
index c0fe9a8..30c56cf 100644
--- a/src/multimedia/base/qvideodevicecontrol.cpp
+++ b/src/multimedia/mediaservices/base/qvideodevicecontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/qvideodevicecontrol.h>
+#include <QtMediaServices/qvideodevicecontrol.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/base/qvideodevicecontrol.h b/src/multimedia/mediaservices/base/qvideodevicecontrol.h
index ce99fd1..0b9235b 100644
--- a/src/multimedia/base/qvideodevicecontrol.h
+++ b/src/multimedia/mediaservices/base/qvideodevicecontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,7 +42,7 @@
 #ifndef QVIDEODEVICECONTROL_H
 #define QVIDEODEVICECONTROL_H
 
-#include <QtMultimedia/qmediacontrol.h>
+#include <QtMediaServices/qmediacontrol.h>
 
 
 QT_BEGIN_HEADER
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Multimedia)
 
-class Q_MULTIMEDIA_EXPORT QVideoDeviceControl : public QMediaControl
+class Q_MEDIASERVICES_EXPORT QVideoDeviceControl : public QMediaControl
 {
     Q_OBJECT
 
diff --git a/src/multimedia/base/qvideooutputcontrol.cpp b/src/multimedia/mediaservices/base/qvideooutputcontrol.cpp
index 58f1527..532c892 100644
--- a/src/multimedia/base/qvideooutputcontrol.cpp
+++ b/src/multimedia/mediaservices/base/qvideooutputcontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/qvideooutputcontrol.h>
+#include <QtMediaServices/qvideooutputcontrol.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/base/qvideooutputcontrol.h b/src/multimedia/mediaservices/base/qvideooutputcontrol.h
index 805da58..f87bb3c 100644
--- a/src/multimedia/base/qvideooutputcontrol.h
+++ b/src/multimedia/mediaservices/base/qvideooutputcontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,7 +42,7 @@
 #ifndef QVIDEOOUTPUTCONTROL_H
 #define QVIDEOOUTPUTCONTROL_H
 
-#include <QtMultimedia/qmediacontrol.h>
+#include <QtMediaServices/qmediacontrol.h>
 
 
 QT_BEGIN_HEADER
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Multimedia)
 
 
-class Q_MULTIMEDIA_EXPORT QVideoOutputControl : public QMediaControl
+class Q_MEDIASERVICES_EXPORT QVideoOutputControl : public QMediaControl
 {
     Q_OBJECT
 
diff --git a/src/multimedia/base/qvideorenderercontrol.cpp b/src/multimedia/mediaservices/base/qvideorenderercontrol.cpp
index a34ef9b..6cc3138 100644
--- a/src/multimedia/base/qvideorenderercontrol.cpp
+++ b/src/multimedia/mediaservices/base/qvideorenderercontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/qvideorenderercontrol.h>
+#include <QtMediaServices/qvideorenderercontrol.h>
 
 #include "qmediacontrol_p.h"
 
diff --git a/src/multimedia/base/qvideorenderercontrol.h b/src/multimedia/mediaservices/base/qvideorenderercontrol.h
index f5ba83e..28e3d85 100644
--- a/src/multimedia/base/qvideorenderercontrol.h
+++ b/src/multimedia/mediaservices/base/qvideorenderercontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,7 +42,7 @@
 #ifndef QVIDEORENDERERCONTROL_H
 #define QVIDEORENDERERCONTROL_H
 
-#include <QtMultimedia/qmediacontrol.h>
+#include <QtMediaServices/qmediacontrol.h>
 
 QT_BEGIN_HEADER
 
@@ -53,7 +53,7 @@ QT_MODULE(Multimedia)
 
 class QAbstractVideoSurface;
 
-class Q_MULTIMEDIA_EXPORT QVideoRendererControl : public QMediaControl
+class Q_MEDIASERVICES_EXPORT QVideoRendererControl : public QMediaControl
 {
     Q_OBJECT
 
diff --git a/src/multimedia/base/qvideowidget.cpp b/src/multimedia/mediaservices/base/qvideowidget.cpp
index b791abd..d39b1f4 100644
--- a/src/multimedia/base/qvideowidget.cpp
+++ b/src/multimedia/mediaservices/base/qvideowidget.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -41,14 +41,14 @@
 
 #include "qvideowidget_p.h"
 
-#include <QtMultimedia/qmediaobject.h>
-#include <QtMultimedia/qmediaservice.h>
-#include <QtMultimedia/qvideooutputcontrol.h>
-#include <QtMultimedia/qvideowindowcontrol.h>
-#include <QtMultimedia/qvideowidgetcontrol.h>
+#include <QtMediaServices/qmediaobject.h>
+#include <QtMediaServices/qmediaservice.h>
+#include <QtMediaServices/qvideooutputcontrol.h>
+#include <QtMediaServices/qvideowindowcontrol.h>
+#include <QtMediaServices/qvideowidgetcontrol.h>
 
 #include "qpaintervideosurface_p.h"
-#include <QtMultimedia/qvideorenderercontrol.h>
+#include <QtMediaServices/qvideorenderercontrol.h>
 #include <QtMultimedia/qvideosurfaceformat.h>
 #include <qpainter.h>
 
diff --git a/src/multimedia/base/qvideowidget.h b/src/multimedia/mediaservices/base/qvideowidget.h
index 4b24bcb..a21739a 100644
--- a/src/multimedia/base/qvideowidget.h
+++ b/src/multimedia/mediaservices/base/qvideowidget.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -55,7 +55,7 @@ QT_MODULE(Multimedia)
 class QMediaObject;
 
 class QVideoWidgetPrivate;
-class Q_MULTIMEDIA_EXPORT QVideoWidget : public QWidget
+class Q_MEDIASERVICES_EXPORT QVideoWidget : public QWidget
 {
     Q_OBJECT
     Q_PROPERTY(QMediaObject* mediaObject READ mediaObject WRITE setMediaObject)
@@ -121,7 +121,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_hueChanged(int))
     Q_PRIVATE_SLOT(d_func(), void _q_saturationChanged(int))
     Q_PRIVATE_SLOT(d_func(), void _q_fullScreenChanged(bool))
-    Q_PRIVATE_SLOT(d_func(), void _q_dimensionsChanged());
+    Q_PRIVATE_SLOT(d_func(), void _q_dimensionsChanged())
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/base/qvideowidget_p.h b/src/multimedia/mediaservices/base/qvideowidget_p.h
index 44fd1cd..bb44dfa 100644
--- a/src/multimedia/base/qvideowidget_p.h
+++ b/src/multimedia/mediaservices/base/qvideowidget_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtMultimedia/qvideowidget.h>
+#include <QtMediaServices/qvideowidget.h>
 
 #ifndef QT_NO_OPENGL
 #include <QGLWidget>
diff --git a/src/multimedia/base/qvideowidgetcontrol.cpp b/src/multimedia/mediaservices/base/qvideowidgetcontrol.cpp
index e8957dc..538f158 100644
--- a/src/multimedia/base/qvideowidgetcontrol.cpp
+++ b/src/multimedia/mediaservices/base/qvideowidgetcontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/qvideowidgetcontrol.h>
+#include <QtMediaServices/qvideowidgetcontrol.h>
 #include "qmediacontrol_p.h"
 
 
diff --git a/src/multimedia/base/qvideowidgetcontrol.h b/src/multimedia/mediaservices/base/qvideowidgetcontrol.h
index 4c0a6c6..1013beb 100644
--- a/src/multimedia/base/qvideowidgetcontrol.h
+++ b/src/multimedia/mediaservices/base/qvideowidgetcontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -44,8 +44,8 @@
 
 #include <QtGui/qwidget.h>
 
-#include <QtMultimedia/qvideowidget.h>
-#include <QtMultimedia/qmediacontrol.h>
+#include <QtMediaServices/qvideowidget.h>
+#include <QtMediaServices/qmediacontrol.h>
 
 
 QT_BEGIN_HEADER
@@ -57,7 +57,7 @@ QT_MODULE(Multimedia)
 
 class QVideoWidgetControlPrivate;
 
-class Q_MULTIMEDIA_EXPORT QVideoWidgetControl : public QMediaControl
+class Q_MEDIASERVICES_EXPORT QVideoWidgetControl : public QMediaControl
 {
     Q_OBJECT
 
diff --git a/src/multimedia/base/qvideowindowcontrol.cpp b/src/multimedia/mediaservices/base/qvideowindowcontrol.cpp
index c74a0d5..967a2d6 100644
--- a/src/multimedia/base/qvideowindowcontrol.cpp
+++ b/src/multimedia/mediaservices/base/qvideowindowcontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/qvideowindowcontrol.h>
+#include <QtMediaServices/qvideowindowcontrol.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/base/qvideowindowcontrol.h b/src/multimedia/mediaservices/base/qvideowindowcontrol.h
index 53f7b0e..47ba520 100644
--- a/src/multimedia/base/qvideowindowcontrol.h
+++ b/src/multimedia/mediaservices/base/qvideowindowcontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -44,8 +44,8 @@
 
 #include <QtGui/qwidget.h>
 
-#include <QtMultimedia/qmediacontrol.h>
-#include <QtMultimedia/qvideowidget.h>
+#include <QtMediaServices/qmediacontrol.h>
+#include <QtMediaServices/qvideowidget.h>
 
 QT_BEGIN_HEADER
 
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Multimedia)
 
 
-class Q_MULTIMEDIA_EXPORT QVideoWindowControl : public QMediaControl
+class Q_MEDIASERVICES_EXPORT QVideoWindowControl : public QMediaControl
 {
     Q_OBJECT
 
diff --git a/src/multimedia/effects/effects.pri b/src/multimedia/mediaservices/effects/effects.pri
index 6307255..6307255 100644
--- a/src/multimedia/effects/effects.pri
+++ b/src/multimedia/mediaservices/effects/effects.pri
diff --git a/src/multimedia/effects/qsoundeffect.cpp b/src/multimedia/mediaservices/effects/qsoundeffect.cpp
index 1992ee5..1992ee5 100644
--- a/src/multimedia/effects/qsoundeffect.cpp
+++ b/src/multimedia/mediaservices/effects/qsoundeffect.cpp
diff --git a/src/multimedia/effects/qsoundeffect_p.h b/src/multimedia/mediaservices/effects/qsoundeffect_p.h
index 05207a0..64ddb77 100644
--- a/src/multimedia/effects/qsoundeffect_p.h
+++ b/src/multimedia/mediaservices/effects/qsoundeffect_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -63,7 +63,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QSoundEffectPrivate;
-class Q_MULTIMEDIA_EXPORT QSoundEffect : public QObject
+class Q_MEDIASERVICES_EXPORT QSoundEffect : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
diff --git a/src/multimedia/effects/qsoundeffect_pulse_p.cpp b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp
index e379259..c856157 100644
--- a/src/multimedia/effects/qsoundeffect_pulse_p.cpp
+++ b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/effects/qsoundeffect_pulse_p.h b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.h
index aff729c..1327bf5 100644
--- a/src/multimedia/effects/qsoundeffect_pulse_p.h
+++ b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -58,7 +58,7 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qdatetime.h>
-#include <QtMultimedia/qmediaplayer.h>
+#include <QtMediaServices/qmediaplayer.h>
 #include <pulse/pulseaudio.h>
 
 
diff --git a/src/multimedia/effects/qsoundeffect_qmedia_p.cpp b/src/multimedia/mediaservices/effects/qsoundeffect_qmedia_p.cpp
index 36c36dd..5e40bed 100644
--- a/src/multimedia/effects/qsoundeffect_qmedia_p.cpp
+++ b/src/multimedia/mediaservices/effects/qsoundeffect_qmedia_p.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -54,8 +54,8 @@
 
 #include <QtCore/qcoreapplication.h>
 
-#include <QtMultimedia/qmediacontent.h>
-#include <QtMultimedia/qmediaplayer.h>
+#include <QtMediaServices/qmediacontent.h>
+#include <QtMediaServices/qmediaplayer.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/effects/qsoundeffect_qmedia_p.h b/src/multimedia/mediaservices/effects/qsoundeffect_qmedia_p.h
index 6ad9d79..82ea000 100644
--- a/src/multimedia/effects/qsoundeffect_qmedia_p.h
+++ b/src/multimedia/mediaservices/effects/qsoundeffect_qmedia_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -56,7 +56,7 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
-#include <QtMultimedia/qmediaplayer.h>
+#include <QtMediaServices/qmediaplayer.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/effects/qsoundeffect_qsound_p.cpp b/src/multimedia/mediaservices/effects/qsoundeffect_qsound_p.cpp
index ff30f67..9247aba 100644
--- a/src/multimedia/effects/qsoundeffect_qsound_p.cpp
+++ b/src/multimedia/mediaservices/effects/qsoundeffect_qsound_p.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/effects/qsoundeffect_qsound_p.h b/src/multimedia/mediaservices/effects/qsoundeffect_qsound_p.h
index 6fb3cfa..dad7b6f 100644
--- a/src/multimedia/effects/qsoundeffect_qsound_p.h
+++ b/src/multimedia/mediaservices/effects/qsoundeffect_qsound_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/effects/wavedecoder_p.cpp b/src/multimedia/mediaservices/effects/wavedecoder_p.cpp
index b534ded..1c26c8f 100644
--- a/src/multimedia/effects/wavedecoder_p.cpp
+++ b/src/multimedia/mediaservices/effects/wavedecoder_p.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/effects/wavedecoder_p.h b/src/multimedia/mediaservices/effects/wavedecoder_p.h
index c1892bb..dcc5453 100644
--- a/src/multimedia/effects/wavedecoder_p.h
+++ b/src/multimedia/mediaservices/effects/wavedecoder_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/mediaservices/mediaservices.pro b/src/multimedia/mediaservices/mediaservices.pro
new file mode 100644
index 0000000..d5b0e4c
--- /dev/null
+++ b/src/multimedia/mediaservices/mediaservices.pro
@@ -0,0 +1,21 @@
+TARGET = QtMediaServices
+QPRO_PWD = $$PWD
+QT = core gui multimedia
+
+DEFINES += QT_BUILD_MEDIASERVICES_LIB QT_NO_USING_NAMESPACE
+
+unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtMultimedia
+
+include(../../qbase.pri)
+
+include(base/base.pri)
+include(playback/playback.pri)
+include(effects/effects.pri)
+
+symbian: {
+    TARGET.UID3 = 0x2001E631
+    contains(CONFIG, def_files) {
+        DEF_FILE=../../s60installs
+    }
+}
+
diff --git a/src/multimedia/playback/playback.pri b/src/multimedia/mediaservices/playback/playback.pri
index 09a81c9..09a81c9 100644
--- a/src/multimedia/playback/playback.pri
+++ b/src/multimedia/mediaservices/playback/playback.pri
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/mediaservices/playback/qmediaplayer.cpp
index 6b2e0f9..ca1f250 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/mediaservices/playback/qmediaplayer.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -45,16 +45,16 @@
 #include <QtCore/qpointer.h>
 #include <QtCore/qdebug.h>
 
-#include <QtMultimedia/qmediaplayer.h>
+#include <QtMediaServices/qmediaplayer.h>
 
-#include <QtMultimedia/private/qmediaobject_p.h>
-#include <QtMultimedia/qmediaservice.h>
-#include <QtMultimedia/qmediaplayercontrol.h>
-#include <QtMultimedia/qmediaserviceprovider.h>
-#include <QtMultimedia/qmediaplaylist.h>
-#include <QtMultimedia/qmediaplaylistcontrol.h>
-#include <QtMultimedia/qvideowidget.h>
-#include <QtMultimedia/qgraphicsvideoitem.h>
+#include <QtMediaServices/private/qmediaobject_p.h>
+#include <QtMediaServices/qmediaservice.h>
+#include <QtMediaServices/qmediaplayercontrol.h>
+#include <QtMediaServices/qmediaserviceprovider.h>
+#include <QtMediaServices/qmediaplaylist.h>
+#include <QtMediaServices/qmediaplaylistcontrol.h>
+#include <QtMediaServices/qvideowidget.h>
+#include <QtMediaServices/qgraphicsvideoitem.h>
 
 //#define DEBUG_PLAYER_STATE
 
@@ -491,9 +491,9 @@ void QMediaPlayer::play()
     Q_D(QMediaPlayer);
 
     if (d->control == 0) {
-        QMetaObject::invokeMethod(this, "_q_error", Qt::QueuedConnection);
+        QMetaObject::invokeMethod(this, "_q_error", Qt::QueuedConnection,
                                     Q_ARG(int, QMediaPlayer::ServiceMissingError),
-                                    Q_ARG(QString, tr("The QMediaPlayer object does not have a valid service"));
+                                    Q_ARG(QString, tr("The QMediaPlayer object does not have a valid service")));
         return;
     }
 
@@ -682,7 +682,7 @@ void QMediaPlayer::unbind(QObject *obj)
     The \a flags argument allows additional requirements such as performance indicators to be
     specified.
 */
-QtMultimedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType,
+QtMediaServices::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType,
                                                const QStringList& codecs,
                                                Flags flags)
 {
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/mediaservices/playback/qmediaplayer.h
index 129b244..d75c58a 100644
--- a/src/multimedia/playback/qmediaplayer.h
+++ b/src/multimedia/mediaservices/playback/qmediaplayer.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,9 +42,9 @@
 #ifndef QMEDIAPLAYER_H
 #define QMEDIAPLAYER_H
 
-#include <QtMultimedia/qmediaserviceprovider.h>
-#include <QtMultimedia/qmediaobject.h>
-#include <QtMultimedia/qmediacontent.h>
+#include <QtMediaServices/qmediaserviceprovider.h>
+#include <QtMediaServices/qmediaobject.h>
+#include <QtMediaServices/qmediacontent.h>
 
 
 QT_BEGIN_HEADER
@@ -57,7 +57,7 @@ QT_MODULE(Multimedia)
 class QMediaPlaylist;
 
 class QMediaPlayerPrivate;
-class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QMediaObject
+class Q_MEDIASERVICES_EXPORT QMediaPlayer : public QMediaObject
 {
     Q_OBJECT
     Q_PROPERTY(QMediaContent media READ media WRITE setMedia NOTIFY mediaChanged)
@@ -117,7 +117,7 @@ public:
     QMediaPlayer(QObject *parent = 0, Flags flags = 0, QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider());
     ~QMediaPlayer();
 
-    static QtMultimedia::SupportEstimate hasSupport(const QString &mimeType,
+    static QtMediaServices::SupportEstimate hasSupport(const QString &mimeType,
                                             const QStringList& codecs = QStringList(),
                                             Flags flags = 0);
     static QStringList supportedMimeTypes(Flags flags = 0);
diff --git a/src/multimedia/playback/qmediaplayercontrol.cpp b/src/multimedia/mediaservices/playback/qmediaplayercontrol.cpp
index 2129098..ca58ce4 100644
--- a/src/multimedia/playback/qmediaplayercontrol.cpp
+++ b/src/multimedia/mediaservices/playback/qmediaplayercontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/qmediaplayercontrol.h>
-#include <QtMultimedia/private/qmediacontrol_p.h>
-#include <QtMultimedia/qmediaplayer.h>
+#include <QtMediaServices/qmediaplayercontrol.h>
+#include <QtMediaServices/private/qmediacontrol_p.h>
+#include <QtMediaServices/qmediaplayer.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/playback/qmediaplayercontrol.h b/src/multimedia/mediaservices/playback/qmediaplayercontrol.h
index a7e418b..7a3c24e 100644
--- a/src/multimedia/playback/qmediaplayercontrol.h
+++ b/src/multimedia/mediaservices/playback/qmediaplayercontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -44,9 +44,9 @@
 
 #include <QtCore/qpair.h>
 
-#include <QtMultimedia/qmediacontrol.h>
-#include <QtMultimedia/qmediaplayer.h>
-#include <QtMultimedia/qmediatimerange.h>
+#include <QtMediaServices/qmediacontrol.h>
+#include <QtMediaServices/qmediaplayer.h>
+#include <QtMediaServices/qmediatimerange.h>
 
 
 QT_BEGIN_HEADER
@@ -58,7 +58,7 @@ QT_MODULE(Multimedia)
 
 class QMediaPlaylist;
 
-class Q_MULTIMEDIA_EXPORT QMediaPlayerControl : public QMediaControl
+class Q_MEDIASERVICES_EXPORT QMediaPlayerControl : public QMediaControl
 {
     Q_OBJECT
 
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 500aff7..8cdcb38 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -1,17 +1,8 @@
-TARGET = QtMultimedia
-QPRO_PWD = $$PWD
-QT = core gui
+TEMPLATE = subdirs
 
-DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE
+contains(QT_CONFIG, multimedia) {
+    SUBDIRS += multimedia
 
-unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
+    contains(QT_CONFIG, mediaservices):SUBDIRS += mediaservices
+}
 
-include(../qbase.pri)
-
-include(audio/audio.pri)
-include(video/video.pri)
-include(base/base.pri)
-include(playback/playback.pri)
-include(effects/effects.pri)
-
-symbian: TARGET.UID3 = 0x2001E627
diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/multimedia/audio/audio.pri
index ae28a26..ae28a26 100644
--- a/src/multimedia/audio/audio.pri
+++ b/src/multimedia/multimedia/audio/audio.pri
diff --git a/src/multimedia/audio/qaudio.cpp b/src/multimedia/multimedia/audio/qaudio.cpp
index e0f24ce..e0f24ce 100644
--- a/src/multimedia/audio/qaudio.cpp
+++ b/src/multimedia/multimedia/audio/qaudio.cpp
diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/multimedia/audio/qaudio.h
index 9ca1dff..9ca1dff 100644
--- a/src/multimedia/audio/qaudio.h
+++ b/src/multimedia/multimedia/audio/qaudio.h
diff --git a/src/multimedia/audio/qaudio_mac.cpp b/src/multimedia/multimedia/audio/qaudio_mac.cpp
index 14fee8b..14fee8b 100644
--- a/src/multimedia/audio/qaudio_mac.cpp
+++ b/src/multimedia/multimedia/audio/qaudio_mac.cpp
diff --git a/src/multimedia/audio/qaudio_mac_p.h b/src/multimedia/multimedia/audio/qaudio_mac_p.h
index 4e7d688..4e7d688 100644
--- a/src/multimedia/audio/qaudio_mac_p.h
+++ b/src/multimedia/multimedia/audio/qaudio_mac_p.h
diff --git a/src/multimedia/audio/qaudio_symbian_p.cpp b/src/multimedia/multimedia/audio/qaudio_symbian_p.cpp
index afe98f5..afe98f5 100644
--- a/src/multimedia/audio/qaudio_symbian_p.cpp
+++ b/src/multimedia/multimedia/audio/qaudio_symbian_p.cpp
diff --git a/src/multimedia/audio/qaudio_symbian_p.h b/src/multimedia/multimedia/audio/qaudio_symbian_p.h
index d5238b4..d5238b4 100644
--- a/src/multimedia/audio/qaudio_symbian_p.h
+++ b/src/multimedia/multimedia/audio/qaudio_symbian_p.h
diff --git a/src/multimedia/audio/qaudiodevicefactory.cpp b/src/multimedia/multimedia/audio/qaudiodevicefactory.cpp
index 4f45110..74add64 100644
--- a/src/multimedia/audio/qaudiodevicefactory.cpp
+++ b/src/multimedia/multimedia/audio/qaudiodevicefactory.cpp
@@ -67,9 +67,10 @@
 
 QT_BEGIN_NAMESPACE
 
+#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
         (QAudioEngineFactoryInterface_iid, QLatin1String("/audio"), Qt::CaseInsensitive))
-
+#endif
 
 class QNullDeviceInfo : public QAbstractAudioDeviceInfo
 {
@@ -137,6 +138,8 @@ QList<QAudioDeviceInfo> QAudioDeviceFactory::availableDevices(QAudio::Mode mode)
         devices << QAudioDeviceInfo(QLatin1String("builtin"), handle, mode);
 #endif
 #endif
+
+#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
     QFactoryLoader* l = loader();
 
     foreach (QString const& key, l->keys()) {
@@ -148,12 +151,14 @@ QList<QAudioDeviceInfo> QAudioDeviceFactory::availableDevices(QAudio::Mode mode)
 
         delete plugin;
     }
+#endif
 
     return devices;
 }
 
 QAudioDeviceInfo QAudioDeviceFactory::defaultInputDevice()
 {
+#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
     QAudioEngineFactoryInterface* plugin = qobject_cast<QAudioEngineFactoryInterface*>(loader()->instance(QLatin1String("default")));
 
     if (plugin) {
@@ -161,6 +166,8 @@ QAudioDeviceInfo QAudioDeviceFactory::defaultInputDevice()
         if (list.size() > 0)
             return QAudioDeviceInfo(QLatin1String("default"), list.at(0), QAudio::AudioInput);
     }
+#endif
+
 #ifndef QT_NO_AUDIO_BACKEND
 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) || defined(Q_OS_SYMBIAN))
     return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultInputDevice(), QAudio::AudioInput);
@@ -171,6 +178,7 @@ QAudioDeviceInfo QAudioDeviceFactory::defaultInputDevice()
 
 QAudioDeviceInfo QAudioDeviceFactory::defaultOutputDevice()
 {
+#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
     QAudioEngineFactoryInterface* plugin = qobject_cast<QAudioEngineFactoryInterface*>(loader()->instance(QLatin1String("default")));
 
     if (plugin) {
@@ -178,6 +186,8 @@ QAudioDeviceInfo QAudioDeviceFactory::defaultOutputDevice()
         if (list.size() > 0)
             return QAudioDeviceInfo(QLatin1String("default"), list.at(0), QAudio::AudioOutput);
     }
+#endif
+
 #ifndef QT_NO_AUDIO_BACKEND
 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) || defined(Q_OS_SYMBIAN))
     return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultOutputDevice(), QAudio::AudioOutput);
@@ -196,11 +206,14 @@ QAbstractAudioDeviceInfo* QAudioDeviceFactory::audioDeviceInfo(const QString &re
         return new QAudioDeviceInfoInternal(handle, mode);
 #endif
 #endif
+
+#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
     QAudioEngineFactoryInterface* plugin =
         qobject_cast<QAudioEngineFactoryInterface*>(loader()->instance(realm));
 
     if (plugin)
         rc = plugin->createDeviceInfo(handle, mode);
+#endif
 
     return rc == 0 ? new QNullDeviceInfo() : rc;
 }
@@ -225,11 +238,13 @@ QAbstractAudioInput* QAudioDeviceFactory::createInputDevice(QAudioDeviceInfo con
         return new QAudioInputPrivate(deviceInfo.handle(), format);
 #endif
 #endif
+#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
     QAudioEngineFactoryInterface* plugin =
         qobject_cast<QAudioEngineFactoryInterface*>(loader()->instance(deviceInfo.realm()));
 
     if (plugin)
         return plugin->createInput(deviceInfo.handle(), format);
+#endif
 
     return new QNullInputDevice();
 }
@@ -244,11 +259,14 @@ QAbstractAudioOutput* QAudioDeviceFactory::createOutputDevice(QAudioDeviceInfo c
         return new QAudioOutputPrivate(deviceInfo.handle(), format);
 #endif
 #endif
+
+#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
     QAudioEngineFactoryInterface* plugin =
         qobject_cast<QAudioEngineFactoryInterface*>(loader()->instance(deviceInfo.realm()));
 
     if (plugin)
         return plugin->createOutput(deviceInfo.handle(), format);
+#endif
 
     return new QNullOutputDevice();
 }
diff --git a/src/multimedia/audio/qaudiodevicefactory_p.h b/src/multimedia/multimedia/audio/qaudiodevicefactory_p.h
index 8ee8b05..8ee8b05 100644
--- a/src/multimedia/audio/qaudiodevicefactory_p.h
+++ b/src/multimedia/multimedia/audio/qaudiodevicefactory_p.h
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/multimedia/audio/qaudiodeviceinfo.cpp
index ff04b4e..ff04b4e 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo.cpp
diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/multimedia/audio/qaudiodeviceinfo.h
index 1cc0731..1cc0731 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.h
+++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo.h
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
index 36270a7..36270a7 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
+++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/multimedia/audio/qaudiodeviceinfo_alsa_p.h
index 6f9a459..6f9a459 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
+++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_alsa_p.h
diff --git a/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp b/src/multimedia/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
index ecd03e5..ecd03e5 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
+++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
diff --git a/src/multimedia/audio/qaudiodeviceinfo_mac_p.h b/src/multimedia/multimedia/audio/qaudiodeviceinfo_mac_p.h
index e234384..e234384 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_mac_p.h
+++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_mac_p.h
diff --git a/src/multimedia/audio/qaudiodeviceinfo_symbian_p.cpp b/src/multimedia/multimedia/audio/qaudiodeviceinfo_symbian_p.cpp
index 36284d3..36284d3 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_symbian_p.cpp
+++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_symbian_p.cpp
diff --git a/src/multimedia/audio/qaudiodeviceinfo_symbian_p.h b/src/multimedia/multimedia/audio/qaudiodeviceinfo_symbian_p.h
index 89e539f..89e539f 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_symbian_p.h
+++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_symbian_p.h
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index aee0807..aee0807 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.h b/src/multimedia/multimedia/audio/qaudiodeviceinfo_win32_p.h
index cb6dd91..cb6dd91 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.h
+++ b/src/multimedia/multimedia/audio/qaudiodeviceinfo_win32_p.h
diff --git a/src/multimedia/audio/qaudioengine.cpp b/src/multimedia/multimedia/audio/qaudioengine.cpp
index 7f1f5d3..7f1f5d3 100644
--- a/src/multimedia/audio/qaudioengine.cpp
+++ b/src/multimedia/multimedia/audio/qaudioengine.cpp
diff --git a/src/multimedia/audio/qaudioengine.h b/src/multimedia/multimedia/audio/qaudioengine.h
index df9d09d..df9d09d 100644
--- a/src/multimedia/audio/qaudioengine.h
+++ b/src/multimedia/multimedia/audio/qaudioengine.h
diff --git a/src/multimedia/audio/qaudioengineplugin.cpp b/src/multimedia/multimedia/audio/qaudioengineplugin.cpp
index 82324b5..82324b5 100644
--- a/src/multimedia/audio/qaudioengineplugin.cpp
+++ b/src/multimedia/multimedia/audio/qaudioengineplugin.cpp
diff --git a/src/multimedia/audio/qaudioengineplugin.h b/src/multimedia/multimedia/audio/qaudioengineplugin.h
index 2322d2a..2322d2a 100644
--- a/src/multimedia/audio/qaudioengineplugin.h
+++ b/src/multimedia/multimedia/audio/qaudioengineplugin.h
diff --git a/src/multimedia/audio/qaudioformat.cpp b/src/multimedia/multimedia/audio/qaudioformat.cpp
index 86d72f6..86d72f6 100644
--- a/src/multimedia/audio/qaudioformat.cpp
+++ b/src/multimedia/multimedia/audio/qaudioformat.cpp
diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/multimedia/audio/qaudioformat.h
index 6c835b7..6c835b7 100644
--- a/src/multimedia/audio/qaudioformat.h
+++ b/src/multimedia/multimedia/audio/qaudioformat.h
diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/multimedia/audio/qaudioinput.cpp
index c99e870..c99e870 100644
--- a/src/multimedia/audio/qaudioinput.cpp
+++ b/src/multimedia/multimedia/audio/qaudioinput.cpp
diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/multimedia/audio/qaudioinput.h
index 5be9b5a..5be9b5a 100644
--- a/src/multimedia/audio/qaudioinput.h
+++ b/src/multimedia/multimedia/audio/qaudioinput.h
diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/multimedia/audio/qaudioinput_alsa_p.cpp
index 6b15008..6b15008 100644
--- a/src/multimedia/audio/qaudioinput_alsa_p.cpp
+++ b/src/multimedia/multimedia/audio/qaudioinput_alsa_p.cpp
diff --git a/src/multimedia/audio/qaudioinput_alsa_p.h b/src/multimedia/multimedia/audio/qaudioinput_alsa_p.h
index c907019..c907019 100644
--- a/src/multimedia/audio/qaudioinput_alsa_p.h
+++ b/src/multimedia/multimedia/audio/qaudioinput_alsa_p.h
diff --git a/src/multimedia/audio/qaudioinput_mac_p.cpp b/src/multimedia/multimedia/audio/qaudioinput_mac_p.cpp
index cb65f6e..cb65f6e 100644
--- a/src/multimedia/audio/qaudioinput_mac_p.cpp
+++ b/src/multimedia/multimedia/audio/qaudioinput_mac_p.cpp
diff --git a/src/multimedia/audio/qaudioinput_mac_p.h b/src/multimedia/multimedia/audio/qaudioinput_mac_p.h
index 7aa4168..7aa4168 100644
--- a/src/multimedia/audio/qaudioinput_mac_p.h
+++ b/src/multimedia/multimedia/audio/qaudioinput_mac_p.h
diff --git a/src/multimedia/audio/qaudioinput_symbian_p.cpp b/src/multimedia/multimedia/audio/qaudioinput_symbian_p.cpp
index 52daa88..52daa88 100644
--- a/src/multimedia/audio/qaudioinput_symbian_p.cpp
+++ b/src/multimedia/multimedia/audio/qaudioinput_symbian_p.cpp
diff --git a/src/multimedia/audio/qaudioinput_symbian_p.h b/src/multimedia/multimedia/audio/qaudioinput_symbian_p.h
index ca3ccf7..ca3ccf7 100644
--- a/src/multimedia/audio/qaudioinput_symbian_p.h
+++ b/src/multimedia/multimedia/audio/qaudioinput_symbian_p.h
diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/multimedia/audio/qaudioinput_win32_p.cpp
index b5d673e..b5d673e 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.cpp
+++ b/src/multimedia/multimedia/audio/qaudioinput_win32_p.cpp
diff --git a/src/multimedia/audio/qaudioinput_win32_p.h b/src/multimedia/multimedia/audio/qaudioinput_win32_p.h
index 66c2535..66c2535 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.h
+++ b/src/multimedia/multimedia/audio/qaudioinput_win32_p.h
diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/multimedia/audio/qaudiooutput.cpp
index b0b5244..b0b5244 100644
--- a/src/multimedia/audio/qaudiooutput.cpp
+++ b/src/multimedia/multimedia/audio/qaudiooutput.cpp
diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/multimedia/audio/qaudiooutput.h
index 0f45b1b..0f45b1b 100644
--- a/src/multimedia/audio/qaudiooutput.h
+++ b/src/multimedia/multimedia/audio/qaudiooutput.h
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/multimedia/audio/qaudiooutput_alsa_p.cpp
index cf3726b..cf3726b 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
+++ b/src/multimedia/multimedia/audio/qaudiooutput_alsa_p.cpp
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.h b/src/multimedia/multimedia/audio/qaudiooutput_alsa_p.h
index e6ac231..e6ac231 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.h
+++ b/src/multimedia/multimedia/audio/qaudiooutput_alsa_p.h
diff --git a/src/multimedia/audio/qaudiooutput_mac_p.cpp b/src/multimedia/multimedia/audio/qaudiooutput_mac_p.cpp
index 9689101..9689101 100644
--- a/src/multimedia/audio/qaudiooutput_mac_p.cpp
+++ b/src/multimedia/multimedia/audio/qaudiooutput_mac_p.cpp
diff --git a/src/multimedia/audio/qaudiooutput_mac_p.h b/src/multimedia/multimedia/audio/qaudiooutput_mac_p.h
index 752905c..752905c 100644
--- a/src/multimedia/audio/qaudiooutput_mac_p.h
+++ b/src/multimedia/multimedia/audio/qaudiooutput_mac_p.h
diff --git a/src/multimedia/audio/qaudiooutput_symbian_p.cpp b/src/multimedia/multimedia/audio/qaudiooutput_symbian_p.cpp
index 3f8e933..3f8e933 100644
--- a/src/multimedia/audio/qaudiooutput_symbian_p.cpp
+++ b/src/multimedia/multimedia/audio/qaudiooutput_symbian_p.cpp
diff --git a/src/multimedia/audio/qaudiooutput_symbian_p.h b/src/multimedia/multimedia/audio/qaudiooutput_symbian_p.h
index 00ccb24..00ccb24 100644
--- a/src/multimedia/audio/qaudiooutput_symbian_p.h
+++ b/src/multimedia/multimedia/audio/qaudiooutput_symbian_p.h
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/multimedia/audio/qaudiooutput_win32_p.cpp
index 13bce58..13bce58 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.cpp
+++ b/src/multimedia/multimedia/audio/qaudiooutput_win32_p.cpp
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.h b/src/multimedia/multimedia/audio/qaudiooutput_win32_p.h
index 68a40f7..68a40f7 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.h
+++ b/src/multimedia/multimedia/audio/qaudiooutput_win32_p.h
diff --git a/src/multimedia/multimedia/multimedia.pro b/src/multimedia/multimedia/multimedia.pro
new file mode 100644
index 0000000..ee700b6
--- /dev/null
+++ b/src/multimedia/multimedia/multimedia.pro
@@ -0,0 +1,19 @@
+TARGET = QtMultimedia
+QPRO_PWD = $$PWD
+QT = core gui
+
+DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE
+
+unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
+
+include(../../qbase.pri)
+
+include(audio/audio.pri)
+include(video/video.pri)
+
+symbian: {
+    TARGET.UID3 = 0x2001E627
+    contains(CONFIG, def_files) {
+        DEF_FILE=../../s60installs
+    }
+}
diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/multimedia/video/qabstractvideobuffer.cpp
index e9d30d0..e9d30d0 100644
--- a/src/multimedia/video/qabstractvideobuffer.cpp
+++ b/src/multimedia/multimedia/video/qabstractvideobuffer.cpp
diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/multimedia/video/qabstractvideobuffer.h
index a8389db..a8389db 100644
--- a/src/multimedia/video/qabstractvideobuffer.h
+++ b/src/multimedia/multimedia/video/qabstractvideobuffer.h
diff --git a/src/multimedia/video/qabstractvideobuffer_p.h b/src/multimedia/multimedia/video/qabstractvideobuffer_p.h
index c72f303..c72f303 100644
--- a/src/multimedia/video/qabstractvideobuffer_p.h
+++ b/src/multimedia/multimedia/video/qabstractvideobuffer_p.h
diff --git a/src/multimedia/video/qabstractvideosurface.cpp b/src/multimedia/multimedia/video/qabstractvideosurface.cpp
index 3dabb6b..3dabb6b 100644
--- a/src/multimedia/video/qabstractvideosurface.cpp
+++ b/src/multimedia/multimedia/video/qabstractvideosurface.cpp
diff --git a/src/multimedia/video/qabstractvideosurface.h b/src/multimedia/multimedia/video/qabstractvideosurface.h
index f2cae17..f2cae17 100644
--- a/src/multimedia/video/qabstractvideosurface.h
+++ b/src/multimedia/multimedia/video/qabstractvideosurface.h
diff --git a/src/multimedia/video/qabstractvideosurface_p.h b/src/multimedia/multimedia/video/qabstractvideosurface_p.h
index 42df112..42df112 100644
--- a/src/multimedia/video/qabstractvideosurface_p.h
+++ b/src/multimedia/multimedia/video/qabstractvideosurface_p.h
diff --git a/src/multimedia/video/qimagevideobuffer.cpp b/src/multimedia/multimedia/video/qimagevideobuffer.cpp
index e3e1585..e3e1585 100644
--- a/src/multimedia/video/qimagevideobuffer.cpp
+++ b/src/multimedia/multimedia/video/qimagevideobuffer.cpp
diff --git a/src/multimedia/video/qimagevideobuffer_p.h b/src/multimedia/multimedia/video/qimagevideobuffer_p.h
index 82075d7..82075d7 100644
--- a/src/multimedia/video/qimagevideobuffer_p.h
+++ b/src/multimedia/multimedia/video/qimagevideobuffer_p.h
diff --git a/src/multimedia/video/qmemoryvideobuffer.cpp b/src/multimedia/multimedia/video/qmemoryvideobuffer.cpp
index 2e892b7..2e892b7 100644
--- a/src/multimedia/video/qmemoryvideobuffer.cpp
+++ b/src/multimedia/multimedia/video/qmemoryvideobuffer.cpp
diff --git a/src/multimedia/video/qmemoryvideobuffer_p.h b/src/multimedia/multimedia/video/qmemoryvideobuffer_p.h
index c66cf93..c66cf93 100644
--- a/src/multimedia/video/qmemoryvideobuffer_p.h
+++ b/src/multimedia/multimedia/video/qmemoryvideobuffer_p.h
diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/multimedia/video/qvideoframe.cpp
index 2d66d9e..2d66d9e 100644
--- a/src/multimedia/video/qvideoframe.cpp
+++ b/src/multimedia/multimedia/video/qvideoframe.cpp
diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/multimedia/video/qvideoframe.h
index 668a738..668a738 100644
--- a/src/multimedia/video/qvideoframe.h
+++ b/src/multimedia/multimedia/video/qvideoframe.h
diff --git a/src/multimedia/video/qvideosurfaceformat.cpp b/src/multimedia/multimedia/video/qvideosurfaceformat.cpp
index 1fc13a6..1fc13a6 100644
--- a/src/multimedia/video/qvideosurfaceformat.cpp
+++ b/src/multimedia/multimedia/video/qvideosurfaceformat.cpp
diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/multimedia/video/qvideosurfaceformat.h
index 9c73f5f..9c73f5f 100644
--- a/src/multimedia/video/qvideosurfaceformat.h
+++ b/src/multimedia/multimedia/video/qvideosurfaceformat.h
diff --git a/src/multimedia/video/video.pri b/src/multimedia/multimedia/video/video.pri
index 0547a4c..0547a4c 100644
--- a/src/multimedia/video/video.pri
+++ b/src/multimedia/multimedia/video/video.pri