diff options
Diffstat (limited to 'examples/multimediawidgets')
7 files changed, 7 insertions, 7 deletions
diff --git a/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.cpp b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.cpp index 60b93a116..1fdd1c7f7 100644 --- a/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.cpp +++ b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.cpp @@ -101,7 +101,7 @@ VideoPlayer::VideoPlayer(QWidget *parent) this, &VideoPlayer::setPosition); QBoxLayout *controlLayout = new QHBoxLayout; - controlLayout->setMargin(0); + controlLayout->setContentsMargins(0, 0, 0, 0); controlLayout->addWidget(openButton); controlLayout->addWidget(playButton); controlLayout->addWidget(positionSlider); diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp index 7730f8140..5c1ca4221 100644 --- a/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp +++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp @@ -81,7 +81,7 @@ VideoPlayer::VideoPlayer(QWidget *parent) this, &VideoPlayer::setPosition); QBoxLayout *controlLayout = new QHBoxLayout; - controlLayout->setMargin(0); + controlLayout->setContentsMargins(0, 0, 0, 0); controlLayout->addWidget(openButton); controlLayout->addWidget(playButton); controlLayout->addWidget(positionSlider); diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp index 89246e65c..04da42587 100644 --- a/examples/multimediawidgets/player/player.cpp +++ b/examples/multimediawidgets/player/player.cpp @@ -158,7 +158,7 @@ Player::Player(QWidget *parent) displayLayout->addWidget(m_playlistView); QBoxLayout *controlLayout = new QHBoxLayout; - controlLayout->setMargin(0); + controlLayout->setContentsMargins(0, 0, 0, 0); controlLayout->addWidget(openButton); controlLayout->addStretch(1); controlLayout->addWidget(controls); diff --git a/examples/multimediawidgets/player/playercontrols.cpp b/examples/multimediawidgets/player/playercontrols.cpp index 2a1869b93..3c06c01c6 100644 --- a/examples/multimediawidgets/player/playercontrols.cpp +++ b/examples/multimediawidgets/player/playercontrols.cpp @@ -100,7 +100,7 @@ PlayerControls::PlayerControls(QWidget *parent) connect(m_rateBox, QOverload<int>::of(&QComboBox::activated), this, &PlayerControls::updateRate); QBoxLayout *layout = new QHBoxLayout; - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(m_stopButton); layout->addWidget(m_previousButton); layout->addWidget(m_playButton); diff --git a/examples/multimediawidgets/player/playlistmodel.cpp b/examples/multimediawidgets/player/playlistmodel.cpp index e5246bc37..718c24d2d 100644 --- a/examples/multimediawidgets/player/playlistmodel.cpp +++ b/examples/multimediawidgets/player/playlistmodel.cpp @@ -94,7 +94,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()).canonicalUrl(); + QUrl location = m_playlist->media(index.row()).request().url(); return QFileInfo(location.path()).fileName(); } diff --git a/examples/multimediawidgets/videographicsitem/videoplayer.cpp b/examples/multimediawidgets/videographicsitem/videoplayer.cpp index 995c86d3e..39c113fe5 100644 --- a/examples/multimediawidgets/videographicsitem/videoplayer.cpp +++ b/examples/multimediawidgets/videographicsitem/videoplayer.cpp @@ -90,7 +90,7 @@ VideoPlayer::VideoPlayer(QWidget *parent) this, &VideoPlayer::setPosition); QBoxLayout *controlLayout = new QHBoxLayout; - controlLayout->setMargin(0); + controlLayout->setContentsMargins(0, 0, 0, 0); controlLayout->addWidget(openButton); controlLayout->addWidget(m_playButton); controlLayout->addWidget(m_positionSlider); diff --git a/examples/multimediawidgets/videowidget/videoplayer.cpp b/examples/multimediawidgets/videowidget/videoplayer.cpp index e7ad670fa..1db269503 100644 --- a/examples/multimediawidgets/videowidget/videoplayer.cpp +++ b/examples/multimediawidgets/videowidget/videoplayer.cpp @@ -79,7 +79,7 @@ VideoPlayer::VideoPlayer(QWidget *parent) m_errorLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); QBoxLayout *controlLayout = new QHBoxLayout; - controlLayout->setMargin(0); + controlLayout->setContentsMargins(0, 0, 0, 0); controlLayout->addWidget(openButton); controlLayout->addWidget(m_playButton); controlLayout->addWidget(m_positionSlider); |