Get rid of QMediaContent

There's no need for it without playlist support in QMediaPlayer.
Simply replace it with a QUrl.

Change-Id: I28421772b106dad67d321f2c7053558ebfe2a592
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

4 files changed, 4 insertions, 1 deletions

diff --git a/examples/multimediawidgets/player/main.cpp b/examples/multimediawidgets/player/main.cpp
index a20fb1c4f..4e2b9b6b3 100644
--- a/examples/multimediawidgets/player/main.cpp
+++ b/examples/multimediawidgets/player/main.cpp
@@ -54,6 +54,7 @@
 #include <QCommandLineParser>
 #include <QCommandLineOption>
 #include <QDir>
+#include <QUrl>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/multimediawidgets/player/playlistmodel.cpp b/examples/multimediawidgets/player/playlistmodel.cpp
index eafe6c9d0..ed55cecbb 100644
--- a/examples/multimediawidgets/player/playlistmodel.cpp
+++ b/examples/multimediawidgets/player/playlistmodel.cpp
@@ -100,7 +100,7 @@ QVariant PlaylistModel::data(const QModelIndex &index, int role) const
     if (index.isValid() && role == Qt::DisplayRole) {
         QVariant value = m_data[index];
         if (!value.isValid() && index.column() == Title) {
-            QUrl location = m_playlist->media(index.row()).request().url();
+            QUrl location = m_playlist->media(index.row());
             return QFileInfo(location.path()).fileName();
         }
 
diff --git a/examples/multimediawidgets/videographicsitem/main.cpp b/examples/multimediawidgets/videographicsitem/main.cpp
index 58542b619..e262c3908 100644
--- a/examples/multimediawidgets/videographicsitem/main.cpp
+++ b/examples/multimediawidgets/videographicsitem/main.cpp
@@ -54,6 +54,7 @@
 #include <QCommandLineParser>
 #include <QCommandLineOption>
 #include <QDir>
+#include <QUrl>
 
 int main(int argc, char **argv)
 {
diff --git a/examples/multimediawidgets/videowidget/main.cpp b/examples/multimediawidgets/videowidget/main.cpp
index 367bc9526..3cf7e7989 100644
--- a/examples/multimediawidgets/videowidget/main.cpp
+++ b/examples/multimediawidgets/videowidget/main.cpp
@@ -54,6 +54,7 @@
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QCommandLineOption>
 #include <QtCore/QDir>
+#include <QtCore/QUrl>
 #include <QScreen>
 
 int main(int argc, char *argv[])