Create Mediaservices lib, separate from Multimedia.

author: Justin McPherson <justin.mcpherson@nokia.com> 2010-04-15 19:08:00 +1000
committer: Justin McPherson <justin.mcpherson@nokia.com> 2010-04-15 19:08:00 +1000
commit: e85223d233c0e1d6beca748332b8fbaba3ebbf2d (patch)
tree: 3f6b3df4e7255403ed1b26413240ea7008bf5883 /src/multimedia
parent: 29bb0a4f0fc135337658e5fa273edb06eefaae3d (diff)
download: qt4-tools-e85223d233c0e1d6beca748332b8fbaba3ebbf2d.tar.gz
137 files changed, 239 insertions, 218 deletions
diff --git a/src/multimedia/base/base.pri b/src/multimedia/mediaservices/base/base.pri
index 49eca49080..49eca49080 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 f903eb73ff..05070f82a9 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 e6f0d81141..c0d8f7a448 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>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/base/qlocalmediaplaylistprovider.cpp b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.cpp
index 40ff1fc487..818b285b4c 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 db8deb1d8b..73ff82de3b 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
 
diff --git a/src/multimedia/base/qmediacontent.cpp b/src/multimedia/mediaservices/base/qmediacontent.cpp
index b6bf56b267..f89e901242 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 5a279c1ede..20f0525c2e 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>
 
 
diff --git a/src/multimedia/base/qmediacontrol.cpp b/src/multimedia/mediaservices/base/qmediacontrol.cpp
index b84c49e773..98db9fe4b7 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 8ed9fe86e9..be5d95d870 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
diff --git a/src/multimedia/base/qmediacontrol_p.h b/src/multimedia/mediaservices/base/qmediacontrol_p.h
index 4d00f11e02..ad7e947172 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 0422718743..3d92b122d2 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 d09b1afc63..461e056f1a 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
 
@@ -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 ec2f75a823..4589f030a9 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 b3f3dd3cf3..174a8ac88b 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 494cf11897..132b58cea0 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
diff --git a/src/multimedia/base/qmediaplaylist_p.h b/src/multimedia/mediaservices/base/qmediaplaylist_p.h
index da529b749b..57c2723859 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 ba3d224487..6f3b2fe6fb 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 228ee19cdb..cf489e34c5 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
diff --git a/src/multimedia/base/qmediaplaylistioplugin.cpp b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.cpp
index 48fd721686..ba5dc81882 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 e55298dcfb..6bc041826e 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
diff --git a/src/multimedia/base/qmediaplaylistnavigator.cpp b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.cpp
index 0c52c71f79..134ae77b13 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 73789afe6e..b6d3d96dea 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
diff --git a/src/multimedia/base/qmediaplaylistprovider.cpp b/src/multimedia/mediaservices/base/qmediaplaylistprovider.cpp
index 942f1557e9..c546899fec 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 b8f07d15d2..4929287237 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
diff --git a/src/multimedia/base/qmediaplaylistprovider_p.h b/src/multimedia/mediaservices/base/qmediaplaylistprovider_p.h
index aaf6deb7dd..03f72acb92 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 eaf6218106..a1975ab65b 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 351d2f1e4c..194f6ee2bf 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 646d9a721a..95770928c0 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 a535bbd366..69078cc7f0 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
diff --git a/src/multimedia/base/qmediaservice.cpp b/src/multimedia/mediaservices/base/qmediaservice.cpp
index d9e980bd57..5d522dcd1b 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 c53a15f82a..060019b102 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
 
diff --git a/src/multimedia/base/qmediaservice_p.h b/src/multimedia/mediaservices/base/qmediaservice_p.h
index 7dbcd8ad90..e60e6699fa 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 b089b3909e..48d245d77d 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 6e3149396b..45021c7778 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
 
@@ -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 b1e728be7c..bc41845a3a 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
@@ -76,7 +76,7 @@ Q_DECLARE_INTERFACE(QMediaServiceProviderFactoryInterface, QMediaServiceProvider
 struct Q_MULTIMEDIA_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;
 };
 
diff --git a/src/multimedia/base/qmediatimerange.cpp b/src/multimedia/mediaservices/base/qmediatimerange.cpp
index e1cea7e112..74f54dded9 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 a65629e829..94beaad313 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
diff --git a/src/multimedia/base/qmetadatacontrol.cpp b/src/multimedia/mediaservices/base/qmetadatacontrol.cpp
index 28a82ec3d5..32be987ab8 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 8e18c1697d..cf4a0d3fc5 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
@@ -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 2fe941b6db..b3e0dd576b 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 1154f8623f..1154f8623f 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 64442ed9ee..13c22c2880 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 caba3ba138..de9c24aa61 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
diff --git a/src/multimedia/base/qtmedianamespace.h b/src/multimedia/mediaservices/base/qtmedianamespace.h
index 1e04da8474..7db7aa8e65 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 277b1a5ae4..277b1a5ae4 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 c0fe9a8e8a..128cee9c79 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 ce99fd137b..df1d4fa2d2 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
diff --git a/src/multimedia/base/qvideooutputcontrol.cpp b/src/multimedia/mediaservices/base/qvideooutputcontrol.cpp
index 58f1527de1..7d7ed4bbc8 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 805da580be..05bc164048 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
diff --git a/src/multimedia/base/qvideorenderercontrol.cpp b/src/multimedia/mediaservices/base/qvideorenderercontrol.cpp
index a34ef9b107..bd7c78dd10 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 f5ba83e0cb..fd130ac828 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
 
diff --git a/src/multimedia/base/qvideowidget.cpp b/src/multimedia/mediaservices/base/qvideowidget.cpp
index b791abde55..52291b0659 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 4b24bcbcca..080e19cfcc 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
diff --git a/src/multimedia/base/qvideowidget_p.h b/src/multimedia/mediaservices/base/qvideowidget_p.h
index 44fd1cdcd0..4f67117b2b 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 e8957dc047..1cc7eaf778 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 4c0a6c6a74..a8105ac022 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
diff --git a/src/multimedia/base/qvideowindowcontrol.cpp b/src/multimedia/mediaservices/base/qvideowindowcontrol.cpp
index c74a0d5d3c..f73b187cca 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 53f7b0e5b8..0fabce9ca6 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
 
diff --git a/src/multimedia/effects/effects.pri b/src/multimedia/mediaservices/effects/effects.pri
index 6307255a32..6307255a32 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 8a38103fef..8a38103fef 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 05207a047f..8c8985a7b5 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
diff --git a/src/multimedia/effects/qsoundeffect_pulse_p.cpp b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp
index e37925973d..e834280f56 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
@@ -51,7 +51,7 @@
 //
 
 #include <QtCore/qcoreapplication.h>
-#include <QtMultimedia/qaudioformat.h>
+#include <QtMediaservices/qaudioformat.h>
 #include <QtNetwork>
 #include <QTime>
 
diff --git a/src/multimedia/effects/qsoundeffect_pulse_p.h b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.h
index aff729c8ae..ef6bff1742 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 36c36dd317..8cc267518e 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 6ad9d79abb..5abdcad957 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 ff30f67d06..7746f0c7b7 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 6fb3cfa004..133e6ec8d1 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 b534ded192..2208461e90 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 c1892bb49d..bb22907a26 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 0000000000..908f60a6de
--- /dev/null
+++ b/src/multimedia/mediaservices/mediaservices.pro
@@ -0,0 +1,16 @@
+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
+
diff --git a/src/multimedia/playback/playback.pri b/src/multimedia/mediaservices/playback/playback.pri
index 09a81c9aab..09a81c9aab 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 9466cad3ca..676a6eb63a 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
 
@@ -668,7 +668,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 129b24453c..2b4c4434b5 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
@@ -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 2129098d33..3b63d93868 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 a7e418b8dc..be10713686 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
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 500aff71ce..8cdcb38572 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 ae28a26669..ae28a26669 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 e0f24ce7c1..e0f24ce7c1 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 9ca1dff193..9ca1dff193 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 14fee8baab..14fee8baab 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 4e7d6882b0..4e7d6882b0 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 58e37453fa..58e37453fa 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 d5238b439e..d5238b439e 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 4f451106af..4f451106af 100644
--- a/src/multimedia/audio/qaudiodevicefactory.cpp
+++ b/src/multimedia/multimedia/audio/qaudiodevicefactory.cpp
diff --git a/src/multimedia/audio/qaudiodevicefactory_p.h b/src/multimedia/multimedia/audio/qaudiodevicefactory_p.h
index 8ee8b0566e..8ee8b0566e 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 ff04b4e3d1..ff04b4e3d1 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 1cc07319d8..1cc07319d8 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 36270a7a25..36270a7a25 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 6f9a459366..6f9a459366 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 ecd03e5dc0..ecd03e5dc0 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 e234384856..e234384856 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 36284d3ac1..36284d3ac1 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 89e539fdab..89e539fdab 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 aee0807463..aee0807463 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 cb6dd91aac..cb6dd91aac 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 7f1f5d32c2..7f1f5d32c2 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 df9d09dd3b..df9d09dd3b 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 82324b5222..82324b5222 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 2322d2a829..2322d2a829 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 86d72f6197..86d72f6197 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 6c835b77ed..6c835b77ed 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 c99e87055e..c99e87055e 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 5be9b5a4c4..5be9b5a4c4 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 6b150086a3..6b150086a3 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 c907019318..c907019318 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 cb65f6e635..cb65f6e635 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 7aa4168ba1..7aa4168ba1 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 52daa88126..52daa88126 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 ca3ccf7c81..ca3ccf7c81 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 b5d673ec52..b5d673ec52 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 66c253579b..66c253579b 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 b0b52445da..b0b52445da 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 0f45b1bfda..0f45b1bfda 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 cf3726b1e8..cf3726b1e8 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 e6ac231d6c..e6ac231d6c 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 9689101cab..9689101cab 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 752905cf89..752905cf89 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 3f8e9338ae..3f8e9338ae 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 00ccb24d2a..00ccb24d2a 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 13bce583ac..13bce583ac 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 68a40f78e7..68a40f78e7 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 0000000000..8d130bd3d1
--- /dev/null
+++ b/src/multimedia/multimedia/multimedia.pro
@@ -0,0 +1,14 @@
+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
diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/multimedia/video/qabstractvideobuffer.cpp
index e9d30d0730..e9d30d0730 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 a8389db126..a8389db126 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 c72f303cc0..c72f303cc0 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 3dabb6b00e..3dabb6b00e 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 f2cae17c7c..f2cae17c7c 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 42df1125ba..42df1125ba 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 e3e1585632..e3e1585632 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 82075d726c..82075d726c 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 2e892b7d54..2e892b7d54 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 c66cf936f9..c66cf936f9 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 2d66d9e37f..2d66d9e37f 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 668a7382be..668a7382be 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 1fc13a602c..1fc13a602c 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 9c73f5f778..9c73f5f778 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 0547a4c3e1..0547a4c3e1 100644
--- a/src/multimedia/video/video.pri
+++ b/src/multimedia/multimedia/video/video.pri
author	Justin McPherson <justin.mcpherson@nokia.com>	2010-04-15 19:08:00 +1000
committer	Justin McPherson <justin.mcpherson@nokia.com>	2010-04-15 19:08:00 +1000
commit	e85223d233c0e1d6beca748332b8fbaba3ebbf2d (patch)
tree	3f6b3df4e7255403ed1b26413240ea7008bf5883 /src/multimedia
parent	29bb0a4f0fc135337658e5fa273edb06eefaae3d (diff)
download	qt4-tools-e85223d233c0e1d6beca748332b8fbaba3ebbf2d.tar.gz