Move most of playlist API to private.

Moved objects either not needed to be public or require API review/redesign.

Change-Id: Ibeb8b8c9c9a74bea32191c119fa4daaffde57c17
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

29 files changed, 174 insertions, 180 deletions

diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri
index c9fd7252d..69094f766 100644
--- a/src/multimedia/controls/controls.pri
+++ b/src/multimedia/controls/controls.pri
@@ -20,8 +20,6 @@ PUBLIC_HEADERS += \
     controls/qmediagaplessplaybackcontrol.h \
     controls/qmedianetworkaccesscontrol.h \
     controls/qmediaplayercontrol.h \
-    controls/qmediaplaylistcontrol.h \
-    controls/qmediaplaylistsourcecontrol.h \
     controls/qmediarecordercontrol.h \
     controls/qmediastreamscontrol.h \
     controls/qmetadatareadercontrol.h \
@@ -36,7 +34,9 @@ PUBLIC_HEADERS += \
     controls/qmediaavailabilitycontrol.h
 
 PRIVATE_HEADERS += \
-    controls/qaudiodecodercontrol_p.h
+    controls/qaudiodecodercontrol_p.h \
+    controls/qmediaplaylistcontrol_p.h \
+    controls/qmediaplaylistsourcecontrol_p.h
 
 SOURCES += \
     controls/qaudioencodercontrol.cpp \
diff --git a/src/multimedia/controls/qmediaplaylistcontrol.cpp b/src/multimedia/controls/qmediaplaylistcontrol.cpp
index f3d6cdab1..c33485512 100644
--- a/src/multimedia/controls/qmediaplaylistcontrol.cpp
+++ b/src/multimedia/controls/qmediaplaylistcontrol.cpp
@@ -40,13 +40,15 @@
 ****************************************************************************/
 
 
-#include "qmediaplaylistcontrol.h"
+#include "qmediaplaylistcontrol_p.h"
 #include "qmediacontrol_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaPlaylistControl
+    \internal
+
     \inmodule QtMultimedia
 
     \ingroup multimedia
@@ -201,6 +203,6 @@ QMediaPlaylistControl::~QMediaPlaylistControl()
   Signal emitted when current media changes to \a content.
 */
 
-#include "moc_qmediaplaylistcontrol.cpp"
+#include "moc_qmediaplaylistcontrol_p.cpp"
 QT_END_NAMESPACE
 
diff --git a/src/multimedia/controls/qmediaplaylistcontrol.h b/src/multimedia/controls/qmediaplaylistcontrol_p.h
index 952e0d1c1..ac2b57f17 100644
--- a/src/multimedia/controls/qmediaplaylistcontrol.h
+++ b/src/multimedia/controls/qmediaplaylistcontrol_p.h
@@ -40,11 +40,23 @@
 ****************************************************************************/
 
 
-#ifndef QMEDIAPLAYLISTCONTROL_H
-#define QMEDIAPLAYLISTCONTROL_H
-
+#ifndef QMEDIAPLAYLISTCONTROL_P_H
+#define QMEDIAPLAYLISTCONTROL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qobject.h>
 #include "qmediacontrol.h"
-#include "qmediaplaylistnavigator.h"
+#include <private/qmediaplaylistnavigator_p.h>
 
 
 QT_BEGIN_HEADER
@@ -95,4 +107,4 @@ QT_END_NAMESPACE
 QT_END_HEADER
 
 
-#endif // QMEDIAPLAYLISTCONTROL_H
+#endif // QMEDIAPLAYLISTCONTROL_P_H
diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp
index 17f5ade1f..e9e815646 100644
--- a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp
+++ b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp
@@ -40,13 +40,15 @@
 ****************************************************************************/
 
 
-#include "qmediaplaylistsourcecontrol.h"
+#include "qmediaplaylistsourcecontrol_p.h"
 #include "qmediacontrol_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaPlaylistSourceControl
+    \internal
+
     \inmodule QtMultimedia
 
     \ingroup multimedia
@@ -121,6 +123,6 @@ QMediaPlaylistSourceControl::~QMediaPlaylistSourceControl()
   Signal emitted when the playlist has changed to \a playlist.
 */
 
-#include "moc_qmediaplaylistsourcecontrol.cpp"
+#include "moc_qmediaplaylistsourcecontrol_p.cpp"
 QT_END_NAMESPACE
 
diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol.h b/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h
index 428bca2a3..be7d8a234 100644
--- a/src/multimedia/controls/qmediaplaylistsourcecontrol.h
+++ b/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h
@@ -40,8 +40,19 @@
 ****************************************************************************/
 
 
-#ifndef QMEDIAPLAYLISTSOURCECONTROL_H
-#define QMEDIAPLAYLISTSOURCECONTROL_H
+#ifndef QMEDIAPLAYLISTSOURCECONTROL_P_H
+#define QMEDIAPLAYLISTSOURCECONTROL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <qmediacontrol.h>
 
@@ -79,4 +90,4 @@ QT_END_NAMESPACE
 QT_END_HEADER
 
 
-#endif // QMEDIAPLAYLISTCONTROL_H
+#endif // QMEDIAPLAYLISTCONTROL_P_H
diff --git a/src/multimedia/playback/playback.pri b/src/multimedia/playback/playback.pri
index f43f608f1..284c9f8e6 100644
--- a/src/multimedia/playback/playback.pri
+++ b/src/multimedia/playback/playback.pri
@@ -2,18 +2,17 @@ INCLUDEPATH += playback
 
 PUBLIC_HEADERS += \
     playback/qaudioendpointselector.h \
-    playback/qlocalmediaplaylistprovider.h \
     playback/qmediacontent.h \
     playback/qmediaplayer.h \
     playback/qmediaplaylist.h \
-    playback/qmediaplaylistioplugin.h \
-    playback/qmediaplaylistnavigator.h \
-    playback/qmediaplaylistprovider.h \
     playback/qmediaresource.h
 
 PRIVATE_HEADERS += \
     playback/qmediaplaylist_p.h \
-    playback/qmediaplaylistprovider_p.h
+    playback/qmediaplaylistprovider_p.h \
+    playback/qmediaplaylistioplugin_p.h \
+    playback/qlocalmediaplaylistprovider_p.h \
+    playback/qmediaplaylistnavigator_p.h
 
 SOURCES += \
     playback/qaudioendpointselector.cpp \
diff --git a/src/multimedia/playback/qlocalmediaplaylistprovider.cpp b/src/multimedia/playback/qlocalmediaplaylistprovider.cpp
index ec00e66c4..051f76a9b 100644
--- a/src/multimedia/playback/qlocalmediaplaylistprovider.cpp
+++ b/src/multimedia/playback/qlocalmediaplaylistprovider.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qlocalmediaplaylistprovider.h"
+#include "qlocalmediaplaylistprovider_p.h"
 #include "qmediaplaylistprovider_p.h"
 #include "qmediacontent.h"
 
@@ -189,6 +189,6 @@ void QLocalMediaPlaylistProvider::shuffle()
 
 }
 
-#include "moc_qlocalmediaplaylistprovider.cpp"
+#include "moc_qlocalmediaplaylistprovider_p.cpp"
 QT_END_NAMESPACE
 
diff --git a/src/multimedia/playback/qlocalmediaplaylistprovider.h b/src/multimedia/playback/qlocalmediaplaylistprovider_p.h
index 8fc3de5b1..879e8f715 100644
--- a/src/multimedia/playback/qlocalmediaplaylistprovider.h
+++ b/src/multimedia/playback/qlocalmediaplaylistprovider_p.h
@@ -39,10 +39,21 @@
 **
 ****************************************************************************/
 
-#ifndef QLOCALMEDIAPAYLISTPROVIDER_H
-#define QLOCALMEDIAPAYLISTPROVIDER_H
-
-#include "qmediaplaylistprovider.h"
+#ifndef QLOCALMEDIAPAYLISTPROVIDER_P_H
+#define QLOCALMEDIAPAYLISTPROVIDER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qmediaplaylistprovider_p.h"
 
 QT_BEGIN_HEADER
 
@@ -84,4 +95,4 @@ QT_END_NAMESPACE
 QT_END_HEADER
 
 
-#endif // QLOCALMEDIAPAYLISTSOURCE_H
+#endif // QLOCALMEDIAPAYLISTSOURCE_P_H
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 0375f5e93..f9b60f587 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -47,8 +47,8 @@
 #include <qmediaplayercontrol.h>
 #include <qmediaserviceprovider_p.h>
 #include <qmediaplaylist.h>
-#include <qmediaplaylistcontrol.h>
-#include <qmediaplaylistsourcecontrol.h>
+#include <qmediaplaylistcontrol_p.h>
+#include <qmediaplaylistsourcecontrol_p.h>
 
 #include <qmedianetworkaccesscontrol.h>
 
diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp
index 67db7f554..860fca2cc 100644
--- a/src/multimedia/playback/qmediaplaylist.cpp
+++ b/src/multimedia/playback/qmediaplaylist.cpp
@@ -41,11 +41,11 @@
 
 #include "qmediaplaylist.h"
 #include "qmediaplaylist_p.h"
-#include "qmediaplaylistprovider.h"
-#include "qlocalmediaplaylistprovider.h"
-#include "qmediaplaylistioplugin.h"
+#include "qmediaplaylistprovider_p.h"
+#include "qlocalmediaplaylistprovider_p.h"
+#include "qmediaplaylistioplugin_p.h"
 #include "qmediaservice.h"
-#include "qmediaplaylistcontrol.h"
+#include "qmediaplaylistcontrol_p.h"
 #include "qmediaplayercontrol.h"
 
 #include <QtCore/qlist.h>
diff --git a/src/multimedia/playback/qmediaplaylist_p.h b/src/multimedia/playback/qmediaplaylist_p.h
index a6ad00d19..7d718da2a 100644
--- a/src/multimedia/playback/qmediaplaylist_p.h
+++ b/src/multimedia/playback/qmediaplaylist_p.h
@@ -54,10 +54,10 @@
 //
 
 #include "qmediaplaylist.h"
-#include "qmediaplaylistcontrol.h"
+#include "qmediaplaylistcontrol_p.h"
 #include "qmediaplayer.h"
 #include "qmediaplayercontrol.h"
-#include "qlocalmediaplaylistprovider.h"
+#include "qlocalmediaplaylistprovider_p.h"
 #include "qmediaobject_p.h"
 
 #include <QtCore/qdebug.h>
diff --git a/src/multimedia/playback/qmediaplaylistioplugin.cpp b/src/multimedia/playback/qmediaplaylistioplugin.cpp
index 084c55d65..99ff8b038 100644
--- a/src/multimedia/playback/qmediaplaylistioplugin.cpp
+++ b/src/multimedia/playback/qmediaplaylistioplugin.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qmediaplaylistioplugin.h"
+#include "qmediaplaylistioplugin_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -117,6 +117,8 @@ QMediaPlaylistWriter::~QMediaPlaylistWriter()
 
 /*!
     \class QMediaPlaylistIOPlugin
+    \internal
+
     \brief The QMediaPlaylistIOPlugin class provides an interface for media playlist I/O plug-ins.
 */
 
@@ -189,6 +191,6 @@ QMediaPlaylistIOPlugin::~QMediaPlaylistIOPlugin()
     If the device is invalid or the format is unsupported this will return a null pointer.
 */
 
-#include "moc_qmediaplaylistioplugin.cpp"
+#include "moc_qmediaplaylistioplugin_p.cpp"
 QT_END_NAMESPACE
 
diff --git a/src/multimedia/playback/qmediaplaylistioplugin.h b/src/multimedia/playback/qmediaplaylistioplugin_p.h
index 64f4056c6..60a12cd4a 100644
--- a/src/multimedia/playback/qmediaplaylistioplugin.h
+++ b/src/multimedia/playback/qmediaplaylistioplugin_p.h
@@ -39,8 +39,19 @@
 **
 ****************************************************************************/
 
-#ifndef QMEDIAPLAYLISTIOPLUGIN_H
-#define QMEDIAPLAYLISTIOPLUGIN_H
+#ifndef QMEDIAPLAYLISTIOPLUGIN_P_H
+#define QMEDIAPLAYLISTIOPLUGIN_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtCore/qobject.h>
 #include <QtCore/qplugin.h>
@@ -123,4 +134,4 @@ QT_END_NAMESPACE
 QT_END_HEADER
 
 
-#endif // QMEDIAPLAYLISTIOPLUGIN_H
+#endif // QMEDIAPLAYLISTIOPLUGIN_P_H
diff --git a/src/multimedia/playback/qmediaplaylistnavigator.cpp b/src/multimedia/playback/qmediaplaylistnavigator.cpp
index 414f735db..f0a02c2c7 100644
--- a/src/multimedia/playback/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/playback/qmediaplaylistnavigator.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qmediaplaylistnavigator.h"
-#include "qmediaplaylistprovider.h"
+#include "qmediaplaylistnavigator_p.h"
+#include "qmediaplaylistprovider_p.h"
 #include "qmediaplaylist.h"
 #include "qmediaobject_p.h"
 
@@ -542,6 +542,6 @@ void QMediaPlaylistNavigatorPrivate::_q_mediaChanged(int start, int end)
     Signals that media immediately surrounding the current position has changed.
 */
 
-#include "moc_qmediaplaylistnavigator.cpp"
+#include "moc_qmediaplaylistnavigator_p.cpp"
 QT_END_NAMESPACE
 
diff --git a/src/multimedia/playback/qmediaplaylistnavigator.h b/src/multimedia/playback/qmediaplaylistnavigator_p.h
index 60061c22a..ab517473a 100644
--- a/src/multimedia/playback/qmediaplaylistnavigator.h
+++ b/src/multimedia/playback/qmediaplaylistnavigator_p.h
@@ -39,10 +39,21 @@
 **
 ****************************************************************************/
 
-#ifndef QMEDIAPLAYLISTNAVIGATOR_H
-#define QMEDIAPLAYLISTNAVIGATOR_H
-
-#include "qmediaplaylistprovider.h"
+#ifndef QMEDIAPLAYLISTNAVIGATOR_P_H
+#define QMEDIAPLAYLISTNAVIGATOR_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qmediaplaylistprovider_p.h"
 #include "qmediaplaylist.h"
 #include <QtCore/qobject.h>
 
@@ -112,4 +123,4 @@ QT_END_NAMESPACE
 QT_END_HEADER
 
 
-#endif // QMEDIAPLAYLISTNAVIGATOR_H
+#endif // QMEDIAPLAYLISTNAVIGATOR_P_H
diff --git a/src/multimedia/playback/qmediaplaylistprovider.cpp b/src/multimedia/playback/qmediaplaylistprovider.cpp
index c3e62a1dd..ddc6b9249 100644
--- a/src/multimedia/playback/qmediaplaylistprovider.cpp
+++ b/src/multimedia/playback/qmediaplaylistprovider.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-#include "qmediaplaylistprovider.h"
 #include "qmediaplaylistprovider_p.h"
 
 #include <QtCore/qurl.h>
@@ -305,6 +304,6 @@ void QMediaPlaylistProvider::shuffle()
     Signals that a load failed() due to an \a error.  The \a errorMessage provides more information.
 */
 
-#include "moc_qmediaplaylistprovider.cpp"
+#include "moc_qmediaplaylistprovider_p.cpp"
 QT_END_NAMESPACE
 
diff --git a/src/multimedia/playback/qmediaplaylistprovider.h b/src/multimedia/playback/qmediaplaylistprovider.h
deleted file mode 100644
index 63fcb112a..000000000
--- a/src/multimedia/playback/qmediaplaylistprovider.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMEDIAPLAYLISTPROVIDER_H
-#define QMEDIAPLAYLISTPROVIDER_H
-
-#include <QObject>
-
-#include "qmediacontent.h"
-#include "qmediaplaylist.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Multimedia)
-
-class QString;
-QT_END_NAMESPACE
-
-QT_BEGIN_NAMESPACE
-
-class QMediaPlaylistProviderPrivate;
-class Q_MULTIMEDIA_EXPORT QMediaPlaylistProvider : public QObject
-{
-Q_OBJECT
-public:
-    QMediaPlaylistProvider(QObject *parent=0);
-    virtual ~QMediaPlaylistProvider();
-
-    virtual bool load(const QUrl &location, const char *format = 0);
-    virtual bool load(QIODevice * device, const char *format = 0);
-    virtual bool save(const QUrl &location, const char *format = 0);
-    virtual bool save(QIODevice * device, const char *format);
-
-    virtual int mediaCount() const = 0;
-    virtual QMediaContent media(int index) const = 0;
-
-    virtual bool isReadOnly() const;
-
-    virtual bool addMedia(const QMediaContent &content);
-    virtual bool addMedia(const QList<QMediaContent> &contentList);
-    virtual bool insertMedia(int index, const QMediaContent &content);
-    virtual bool insertMedia(int index, const QList<QMediaContent> &content);
-    virtual bool removeMedia(int pos);
-    virtual bool removeMedia(int start, int end);
-    virtual bool clear();
-
-public Q_SLOTS:
-    virtual void shuffle();
-
-Q_SIGNALS:
-    void mediaAboutToBeInserted(int start, int end);
-    void mediaInserted(int start, int end);
-
-    void mediaAboutToBeRemoved(int start, int end);
-    void mediaRemoved(int start, int end);
-
-    void mediaChanged(int start, int end);
-
-    void loaded();
-    void loadFailed(QMediaPlaylist::Error, const QString& errorMessage);
-
-protected:
-    QMediaPlaylistProviderPrivate *d_ptr;
-    QMediaPlaylistProvider(QMediaPlaylistProviderPrivate &dd, QObject *parent);
-
-private:
-    Q_DECLARE_PRIVATE(QMediaPlaylistProvider)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-
-#endif // QMEDIAPLAYLISTPROVIDER_H
diff --git a/src/multimedia/playback/qmediaplaylistprovider_p.h b/src/multimedia/playback/qmediaplaylistprovider_p.h
index 6848f750b..7e816f8c8 100644
--- a/src/multimedia/playback/qmediaplaylistprovider_p.h
+++ b/src/multimedia/playback/qmediaplaylistprovider_p.h
@@ -53,6 +53,7 @@
 // We mean it.
 //
 
+#include "qmediacontent.h"
 #include "qmediaplaylist.h"
 
 QT_BEGIN_HEADER
@@ -71,6 +72,54 @@ public:
     {}
 };
 
+class Q_MULTIMEDIA_EXPORT QMediaPlaylistProvider : public QObject
+{
+Q_OBJECT
+public:
+    QMediaPlaylistProvider(QObject *parent=0);
+    virtual ~QMediaPlaylistProvider();
+
+    virtual bool load(const QUrl &location, const char *format = 0);
+    virtual bool load(QIODevice * device, const char *format = 0);
+    virtual bool save(const QUrl &location, const char *format = 0);
+    virtual bool save(QIODevice * device, const char *format);
+
+    virtual int mediaCount() const = 0;
+    virtual QMediaContent media(int index) const = 0;
+
+    virtual bool isReadOnly() const;
+
+    virtual bool addMedia(const QMediaContent &content);
+    virtual bool addMedia(const QList<QMediaContent> &contentList);
+    virtual bool insertMedia(int index, const QMediaContent &content);
+    virtual bool insertMedia(int index, const QList<QMediaContent> &content);
+    virtual bool removeMedia(int pos);
+    virtual bool removeMedia(int start, int end);
+    virtual bool clear();
+
+public Q_SLOTS:
+    virtual void shuffle();
+
+Q_SIGNALS:
+    void mediaAboutToBeInserted(int start, int end);
+    void mediaInserted(int start, int end);
+
+    void mediaAboutToBeRemoved(int start, int end);
+    void mediaRemoved(int start, int end);
+
+    void mediaChanged(int start, int end);
+
+    void loaded();
+    void loadFailed(QMediaPlaylist::Error, const QString& errorMessage);
+
+protected:
+    QMediaPlaylistProviderPrivate *d_ptr;
+    QMediaPlaylistProvider(QMediaPlaylistProviderPrivate &dd, QObject *parent);
+
+private:
+    Q_DECLARE_PRIVATE(QMediaPlaylistProvider)
+};
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
index 3d1b7c5ef..19e261a16 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
@@ -43,7 +43,7 @@
 #include "qgstreamerplayersession.h"
 #include "playerresourcepolicy.h"
 
-#include <qmediaplaylistnavigator.h>
+#include <private/qmediaplaylistnavigator_p.h>
 
 
 #include <QtCore/qdir.h>
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
index f660cef7b..01bb0ed60 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
@@ -67,7 +67,7 @@
 #include "qgstreameraudioprobecontrol.h"
 #include "qgstreamervideoprobecontrol.h"
 
-#include <qmediaplaylistnavigator.h>
+#include <private/qmediaplaylistnavigator_p.h>
 #include <qmediaplaylist.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/m3u/qm3uhandler.h b/src/plugins/m3u/qm3uhandler.h
index 9d235c985..5d8e0e461 100644
--- a/src/plugins/m3u/qm3uhandler.h
+++ b/src/plugins/m3u/qm3uhandler.h
@@ -42,7 +42,7 @@
 #ifndef QM3UHANDLER_H
 #define QM3UHANDLER_H
 
-#include "qmediaplaylistioplugin.h"
+#include <private/qmediaplaylistioplugin_p.h>
 #include <QObject>
 
 QT_USE_NAMESPACE
diff --git a/src/plugins/qt7/mediaplayer/qt7playercontrol.mm b/src/plugins/qt7/mediaplayer/qt7playercontrol.mm
index 043edb929..5be087767 100644
--- a/src/plugins/qt7/mediaplayer/qt7playercontrol.mm
+++ b/src/plugins/qt7/mediaplayer/qt7playercontrol.mm
@@ -42,7 +42,7 @@
 #include "qt7playercontrol.h"
 #include "qt7playersession.h"
 
-#include <qmediaplaylistnavigator.h>
+#include <private/qmediaplaylistnavigator_p.h>
 
 #include <QtCore/qurl.h>
 #include <QtCore/qdebug.h>
diff --git a/src/plugins/qt7/mediaplayer/qt7playerservice.mm b/src/plugins/qt7/mediaplayer/qt7playerservice.mm
index 3e7fdc420..5b89c3806 100644
--- a/src/plugins/qt7/mediaplayer/qt7playerservice.mm
+++ b/src/plugins/qt7/mediaplayer/qt7playerservice.mm
@@ -54,7 +54,7 @@
 #include "qt7movievideowidget.h"
 #include "qt7playermetadata.h"
 
-#include <qmediaplaylistnavigator.h>
+#include <private/qmediaplaylistnavigator_p.h>
 #include <qmediaplaylist.h>
 
 QT_USE_NAMESPACE
diff --git a/src/plugins/qt7/mediaplayer/qt7playersession.mm b/src/plugins/qt7/mediaplayer/qt7playersession.mm
index ec34b220e..efc6cae06 100644
--- a/src/plugins/qt7/mediaplayer/qt7playersession.mm
+++ b/src/plugins/qt7/mediaplayer/qt7playersession.mm
@@ -49,7 +49,7 @@
 #include "qt7videooutput.h"
 
 #include <QtNetwork/qnetworkcookie.h>
-#include <qmediaplaylistnavigator.h>
+#include <private/qmediaplaylistnavigator_p.h>
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
diff --git a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
index 17dff33ca..4d00560e8 100644
--- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
+++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
@@ -43,9 +43,9 @@
 #include <QDebug>
 #include "qmediaservice.h"
 #include "qmediaplaylist.h"
-#include "qmediaplaylistcontrol.h"
-#include "qmediaplaylistsourcecontrol.h"
-#include "qmediaplaylistnavigator.h"
+#include <private/qmediaplaylistcontrol_p.h>
+#include <private/qmediaplaylistsourcecontrol_p.h>
+#include <private/qmediaplaylistnavigator_p.h>
 #include <private/qmediapluginloader_p.h>
 
 #include "qm3uhandler.h"
diff --git a/tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp b/tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp
index 54335fc85..120a2f1e3 100644
--- a/tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp
+++ b/tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp
@@ -43,8 +43,8 @@
 
 #include <QtTest/QtTest>
 #include <QDebug>
-#include "qlocalmediaplaylistprovider.h"
-#include "qmediaplaylistnavigator.h"
+#include <private/qlocalmediaplaylistprovider_p.h>
+#include <private/qmediaplaylistnavigator_p.h>
 
 QT_USE_NAMESPACE
 class tst_QMediaPlaylistNavigator : public QObject
diff --git a/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h b/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h
index c5b3134be..fd22d5b5e 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h
@@ -42,8 +42,8 @@
 #ifndef MOCKMEDIAPLAYLISTCONTROL_H
 #define MOCKMEDIAPLAYLISTCONTROL_H
 
-#include "qmediaplaylistcontrol.h"
-#include "qmediaplaylistnavigator.h"
+#include <private/qmediaplaylistcontrol_p.h>
+#include <private/qmediaplaylistnavigator_p.h>
 
 #include "mockreadonlyplaylistprovider.h"
 
diff --git a/tests/auto/unit/qmultimedia_common/mockmediaplaylistsourcecontrol.h b/tests/auto/unit/qmultimedia_common/mockmediaplaylistsourcecontrol.h
index d8c5ea4a8..f31394b72 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediaplaylistsourcecontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockmediaplaylistsourcecontrol.h
@@ -42,7 +42,7 @@
 #ifndef MOCKMEDIAPLAYLISTSOURCECONTROL_H
 #define MOCKMEDIAPLAYLISTSOURCECONTROL_H
 
-#include "qmediaplaylistsourcecontrol.h"
+#include <private/qmediaplaylistsourcecontrol_p.h>
 
 class MockPlaylistSourceControl : public QMediaPlaylistSourceControl
 {
diff --git a/tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h b/tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h
index 721132cb3..6dce753d0 100644
--- a/tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h
+++ b/tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h
@@ -42,7 +42,7 @@
 #ifndef MOCKREADONLYPLAYLISTPROVIDER_H
 #define MOCKREADONLYPLAYLISTPROVIDER_H
 
-#include "qmediaplaylistprovider.h"
+#include <private/qmediaplaylistprovider_p.h>
 
 class MockReadOnlyPlaylistProvider : public QMediaPlaylistProvider
 {