summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-06-18 08:29:27 +0200
committerLars Knoll <lars.knoll@qt.io>2021-06-18 15:28:13 +0200
commit5773f7214c7430a98dea3974c0597cb3ee0ea7f5 (patch)
tree4ef63d6f66e96a34e44bbab9685489e53b480f33 /tests/auto
parent435d7a1dd3ad96ea64045a320fffad8908e1c2cf (diff)
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>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp1
-rw-r--r--tests/auto/unit/multimedia/CMakeLists.txt2
-rw-r--r--tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp1
3 files changed, 1 insertions, 3 deletions
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"