Remove QMediaPlaylist from QtMultimedia for now

The API needs a redesign. As the class is not used anywhere in
Qt Multimedia, move it to the player example for now. For 6.3,
we should have a good look at how to best implement playlist
support again.

Change-Id: I5a225b69e2cd0f5c88531fdcee80c99f34255efd
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

14 files changed, 9 insertions, 14 deletions

diff --git a/examples/multimediawidgets/player/CMakeLists.txt b/examples/multimediawidgets/player/CMakeLists.txt
index eb2b5a591..48be3d0c6 100644
--- a/examples/multimediawidgets/player/CMakeLists.txt
+++ b/examples/multimediawidgets/player/CMakeLists.txt
@@ -29,6 +29,8 @@ qt_add_executable(player
     playercontrols.cpp playercontrols.h
     playlistmodel.cpp playlistmodel.h
     videowidget.cpp videowidget.h
+    qmediaplaylist.cpp qmediaplaylist.h qmediaplaylist_p.h
+    qplaylistfileparser.cpp qplaylistfileparser_p.h
 )
 set_target_properties(player PROPERTIES
     WIN32_EXECUTABLE TRUE
diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp
index 03420f3f1..7f374bae6 100644
--- a/examples/multimediawidgets/player/player.cpp
+++ b/examples/multimediawidgets/player/player.cpp
@@ -55,7 +55,7 @@
 #include "histogramwidget.h"
 #include "videowidget.h"
 
-#include <QMediaPlaylist>
+#include <qmediaplaylist.h>
 #include <QMediaMetaData>
 #include <QMediaDevices>
 #include <QAudioDevice>
diff --git a/examples/multimediawidgets/player/player.h b/examples/multimediawidgets/player/player.h
index 1d723a343..5dc95cd58 100644
--- a/examples/multimediawidgets/player/player.h
+++ b/examples/multimediawidgets/player/player.h
@@ -53,7 +53,7 @@
 
 #include <QWidget>
 #include <QMediaPlayer>
-#include <QMediaPlaylist>
+#include <qmediaplaylist.h>
 #include <QMediaMetaData>
 
 QT_BEGIN_NAMESPACE
diff --git a/examples/multimediawidgets/player/playlistmodel.cpp b/examples/multimediawidgets/player/playlistmodel.cpp
index 676781b60..f6e683410 100644
--- a/examples/multimediawidgets/player/playlistmodel.cpp
+++ b/examples/multimediawidgets/player/playlistmodel.cpp
@@ -49,10 +49,10 @@
 ****************************************************************************/
 
 #include "playlistmodel.h"
+#include <qmediaplaylist.h>
 
 #include <QFileInfo>
 #include <QUrl>
-#include <QMediaPlaylist>
 
 PlaylistModel::PlaylistModel(QObject *parent)
     : QAbstractItemModel(parent)
diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/examples/multimediawidgets/player/qmediaplaylist.cpp
index 4bd658e35..d2fbe3753 100644
--- a/src/multimedia/playback/qmediaplaylist.cpp
+++ b/examples/multimediawidgets/player/qmediaplaylist.cpp
@@ -39,7 +39,6 @@
 
 #include "qmediaplaylist.h"
 #include "qmediaplaylist_p.h"
-#include "qplatformmediaplayer_p.h"
 #include "qplaylistfileparser_p.h"
 
 #include <QtCore/qlist.h>
diff --git a/src/multimedia/playback/qmediaplaylist.h b/examples/multimediawidgets/player/qmediaplaylist.h
index 734dd07c0..163ef93fe 100644
--- a/src/multimedia/playback/qmediaplaylist.h
+++ b/examples/multimediawidgets/player/qmediaplaylist.h
@@ -49,7 +49,7 @@
 QT_BEGIN_NAMESPACE
 
 class QMediaPlaylistPrivate;
-class Q_MULTIMEDIA_EXPORT QMediaPlaylist : public QObject
+class QMediaPlaylist : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QMediaPlaylist::PlaybackMode playbackMode READ playbackMode WRITE setPlaybackMode NOTIFY playbackModeChanged)
diff --git a/src/multimedia/playback/qmediaplaylist_p.h b/examples/multimediawidgets/player/qmediaplaylist_p.h
index f6644fac9..a09831377 100644
--- a/src/multimedia/playback/qmediaplaylist_p.h
+++ b/examples/multimediawidgets/player/qmediaplaylist_p.h
@@ -52,8 +52,6 @@
 //
 
 #include "qmediaplaylist.h"
-#include "qmediaplayer.h"
-#include "qplatformmediaplayer_p.h"
 #include "qplaylistfileparser_p.h"
 
 #include <QtCore/qdebug.h>
diff --git a/src/multimedia/playback/qplaylistfileparser.cpp b/examples/multimediawidgets/player/qplaylistfileparser.cpp
index d684a9853..d684a9853 100644
--- a/src/multimedia/playback/qplaylistfileparser.cpp
+++ b/examples/multimediawidgets/player/qplaylistfileparser.cpp
diff --git a/src/multimedia/playback/qplaylistfileparser_p.h b/examples/multimediawidgets/player/qplaylistfileparser_p.h
index 011880f06..590472d24 100644
--- a/src/multimedia/playback/qplaylistfileparser_p.h
+++ b/examples/multimediawidgets/player/qplaylistfileparser_p.h
@@ -63,7 +63,7 @@ class QNetworkRequest;
 
 class QPlaylistFileParserPrivate;
 
-class Q_MULTIMEDIA_EXPORT QPlaylistFileParser : public QObject
+class QPlaylistFileParser : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index 4fbccc672..ad9eb2767 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -44,8 +44,6 @@ qt_internal_add_module(Multimedia
         platform/qplatformmediaplayer.cpp platform/qplatformmediaplayer_p.h
         platform/qplatformvideosink.cpp platform/qplatformvideosink_p.h
         playback/qmediaplayer.cpp playback/qmediaplayer.h playback/qmediaplayer_p.h
-        playback/qmediaplaylist.cpp playback/qmediaplaylist.h playback/qmediaplaylist_p.h
-        playback/qplaylistfileparser.cpp playback/qplaylistfileparser_p.h
         qmediadevices.cpp qmediadevices.h
         qmediaenumdebug.h
         qmediaformat.cpp  qmediaformat.h
diff --git a/src/multimediaquick/CMakeLists.txt b/src/multimediaquick/CMakeLists.txt
index 367911945..3eb46865e 100644
--- a/src/multimediaquick/CMakeLists.txt
+++ b/src/multimediaquick/CMakeLists.txt
@@ -22,7 +22,7 @@ qt_internal_add_qml_module(MultimediaQuick
     SOURCES
         qquickimagecapture.cpp qquickimagecapture_p.h
         qquickimagepreviewprovider.cpp qquickimagepreviewprovider_p.h
-        qquickplaylist.cpp qquickplaylist_p.h
+#        qquickplaylist.cpp qquickplaylist_p.h
         qquickvideooutput.cpp qquickvideooutput_p.h
         qquickvideooutput_render.cpp qquickvideooutput_render_p.h
         qsgvideonode_p.cpp qsgvideonode_p.h
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index d58c33ab6..2194f977d 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -29,7 +29,6 @@
 #include <QtTest/QtTest>
 #include <QDebug>
 #include "qmediaplayer.h"
-#include <qmediaplaylist.h>
 #include <qmediametadata.h>
 #include <qaudiobuffer.h>
 #include <qvideosink.h>
diff --git a/tests/auto/unit/multimedia/CMakeLists.txt b/tests/auto/unit/multimedia/CMakeLists.txt
index 46e48ca6c..d95cab75a 100644
--- a/tests/auto/unit/multimedia/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/CMakeLists.txt
@@ -9,7 +9,7 @@ add_subdirectory(qcameradevice)
 add_subdirectory(qimagecapture)
 add_subdirectory(qmediaformat)
 add_subdirectory(qmediaplayer)
-add_subdirectory(qmediaplaylist)
+#add_subdirectory(qmediaplaylist)
 add_subdirectory(qmediarecorder)
 add_subdirectory(qmediatimerange)
 add_subdirectory(qvideoframe)
diff --git a/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp
index 28e7f5baf..807f95a05 100644
--- a/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp
+++ b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp
@@ -36,7 +36,6 @@
 #include <qvideosink.h>
 #include <qmediaplayer.h>
 #include <private/qplatformmediaplayer_p.h>
-#include <qmediaplaylist.h>
 #include <qobject.h>
 
 #include "qmockintegration_p.h"