diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-07-11 10:35:45 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-08-08 10:11:08 +0200 |
commit | 9178132f75563cd0e907525f08736c1b4cec73b4 (patch) | |
tree | 4176f8cedd3dc667ae8ee563026191eac43ecdc2 | |
parent | 5e35587975d6917c9d60ee06c40211af98020105 (diff) |
Remove usages of deprecated APIs
- Replace the usages of deprecated APIs by corresponding
alternatives.
- Made the tests for deprecated APIs to compile conditionally,
based on the deprecation version.
Task-number: QTBUG-76491
Task-number: QTBUG-76540
Task-number: QTBUG-76541
Change-Id: Ifd397dae9b3ebc2ba2504db7baa2d8ff21bfb3a7
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
17 files changed, 83 insertions, 54 deletions
diff --git a/examples/multimedia/spectrum/app/mainwidget.cpp b/examples/multimedia/spectrum/app/mainwidget.cpp index 945313f32..235608a05 100644 --- a/examples/multimedia/spectrum/app/mainwidget.cpp +++ b/examples/multimedia/spectrum/app/mainwidget.cpp @@ -265,7 +265,7 @@ void MainWidget::createUi() QScopedPointer<QHBoxLayout> waveformLayout(new QHBoxLayout); waveformLayout->addWidget(m_progressBar); m_progressBar->setMinimumHeight(m_waveform->minimumHeight()); - waveformLayout->setMargin(0); + waveformLayout->setContentsMargins(0, 0, 0, 0); m_waveform->setLayout(waveformLayout.data()); waveformLayout.take(); windowLayout->addWidget(m_waveform); 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/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); diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp index 991901097..3d3c1294b 100644 --- a/src/multimediawidgets/qvideowidget.cpp +++ b/src/multimediawidgets/qvideowidget.cpp @@ -77,7 +77,7 @@ QVideoWidgetControlBackend::QVideoWidgetControlBackend( connect(control, SIGNAL(fullScreenChanged(bool)), widget, SLOT(_q_fullScreenChanged(bool))); QBoxLayout *layout = new QVBoxLayout; - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(0); QWidget *videoWidget = control->videoWidget(); diff --git a/src/plugins/android/src/common/qandroidvideooutput.cpp b/src/plugins/android/src/common/qandroidvideooutput.cpp index 083ceff24..25e67e865 100644 --- a/src/plugins/android/src/common/qandroidvideooutput.cpp +++ b/src/plugins/android/src/common/qandroidvideooutput.cpp @@ -110,7 +110,7 @@ public: m_image = m_output->m_fbo->toImage(); if (numBytes) - *numBytes = m_image.byteCount(); + *numBytes = static_cast<int>(m_image.sizeInBytes()); if (bytesPerLine) *bytesPerLine = m_image.bytesPerLine(); diff --git a/src/plugins/winrt/qwinrtmediaplayercontrol.cpp b/src/plugins/winrt/qwinrtmediaplayercontrol.cpp index 374ff2831..02d956b5b 100644 --- a/src/plugins/winrt/qwinrtmediaplayercontrol.cpp +++ b/src/plugins/winrt/qwinrtmediaplayercontrol.cpp @@ -762,17 +762,12 @@ void QWinRTMediaPlayerControl::setMedia(const QMediaContent &media, QIODevice *s QString urlString = media.request().url().toString(); if (!d->stream) { // If we can read the file via Qt, use the byte stream approach - const auto resources = media.resources(); - for (const QMediaResource &resource : resources) { - const QUrl url = resource.url(); - if (url.isLocalFile()) { - urlString = url.toLocalFile(); - QScopedPointer<QFile> file(new QFile(urlString)); - if (file->open(QFile::ReadOnly)) { - file->setProperty(QT_WINRT_MEDIAPLAYER_STREAM_ID, true); - d->stream.reset(file.take()); - break; - } + if (media.request().url().isLocalFile()) { + urlString = media.request().url().toLocalFile(); + QScopedPointer<QFile> file(new QFile(urlString)); + if (file->open(QFile::ReadOnly)) { + file->setProperty(QT_WINRT_MEDIAPLAYER_STREAM_ID, true); + d->stream.reset(file.take()); } } } diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index b0497be2f..ccd68aeec 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -68,8 +68,10 @@ public slots: void cleanupTestCase(); private slots: +#if QT_DEPRECATED_SINCE(5, 3) void testAvailableDevices(); void testDeviceDescription(); +#endif void testCameraInfo(); void testCtorWithDevice(); void testCtorWithCameraInfo(); @@ -100,6 +102,7 @@ void tst_QCameraBackend::cleanupTestCase() { } +#if QT_DEPRECATED_SINCE(5, 3) void tst_QCameraBackend::testAvailableDevices() { int deviceCount = QMediaServiceProvider::defaultServiceProvider()->devices(QByteArray(Q_MEDIASERVICE_CAMERA)).count(); @@ -118,6 +121,7 @@ void tst_QCameraBackend::testDeviceDescription() QVERIFY(QCamera::deviceDescription(device).length() > 0); } } +#endif void tst_QCameraBackend::testCameraInfo() { @@ -138,10 +142,11 @@ void tst_QCameraBackend::testCameraInfo() void tst_QCameraBackend::testCtorWithDevice() { - if (QCamera::availableDevices().isEmpty()) + const auto availableCameras = QCameraInfo::availableCameras(); + if (availableCameras.isEmpty()) QSKIP("Camera selection not supported"); - QCamera *camera = new QCamera(QCamera::availableDevices().first()); + QCamera *camera = new QCamera(availableCameras.first().deviceName().toLatin1()); QCOMPARE(camera->error(), QCamera::NoError); delete camera; @@ -625,11 +630,11 @@ void tst_QCameraBackend::testVideoRecording_data() { QTest::addColumn<QByteArray>("device"); - const QList<QByteArray> devices = QCamera::availableDevices(); + const auto devices = QCameraInfo::availableCameras(); - for (const QByteArray &device : devices) { - QTest::newRow(QCamera::deviceDescription(device).toUtf8()) - << device; + for (const auto &device : devices) { + QTest::newRow(device.description().toUtf8()) + << device.deviceName().toLatin1(); } if (devices.isEmpty()) diff --git a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index b270e93eb..87c72521c 100644 --- a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp +++ b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp @@ -411,17 +411,17 @@ void tst_QDeclarativeAudio::source() audio.setSource(url1); QCOMPARE(audio.source(), url1); - QCOMPARE(provider.playerControl()->media().canonicalUrl(), url1); + QCOMPARE(provider.playerControl()->media().request().url(), url1); QCOMPARE(spy.count(), 1); audio.setSource(url2); QCOMPARE(audio.source(), url2); - QCOMPARE(provider.playerControl()->media().canonicalUrl(), url2); + QCOMPARE(provider.playerControl()->media().request().url(), url2); QCOMPARE(spy.count(), 2); audio.setSource(url3); QCOMPARE(audio.source(), url3); - QCOMPARE(provider.playerControl()->media().canonicalUrl(), url3); + QCOMPARE(provider.playerControl()->media().request().url(), url3); QCOMPARE(spy.count(), 3); } diff --git a/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp b/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp index d10257c19..3c68a32b1 100644 --- a/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp +++ b/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp @@ -43,12 +43,16 @@ private slots: void testNull(); void testUrlCtor(); void testRequestCtor(); +#if QT_DEPRECATED_SINCE(6, 0) void testResourceCtor(); void testResourceListCtor(); +#endif void testCopy(); void testAssignment(); void testEquality(); +#if QT_DEPRECATED_SINCE(6, 0) void testResources(); +#endif void testPlaylist(); }; @@ -57,17 +61,23 @@ void tst_QMediaContent::testNull() QMediaContent media; QCOMPARE(media.isNull(), true); + QCOMPARE(media.request().url(), QUrl()); +#if QT_DEPRECATED_SINCE(6, 0) QCOMPARE(media.canonicalUrl(), QUrl()); QCOMPARE(media.canonicalResource(), QMediaResource()); QCOMPARE(media.resources(), QMediaResourceList()); +#endif } void tst_QMediaContent::testUrlCtor() { QMediaContent media(QUrl("http://example.com/movie.mov")); + QCOMPARE(media.request().url(), QUrl("http://example.com/movie.mov")); +#if QT_DEPRECATED_SINCE(6, 0) QCOMPARE(media.canonicalUrl(), QUrl("http://example.com/movie.mov")); QCOMPARE(media.canonicalResource().url(), QUrl("http://example.com/movie.mov")); +#endif } void tst_QMediaContent::testRequestCtor() @@ -76,13 +86,18 @@ void tst_QMediaContent::testRequestCtor() request.setAttribute(QNetworkRequest::User, QVariant(1234)); QMediaContent media(request); + QCOMPARE(media.request().url(), QUrl("http://example.com/movie.mov")); + QCOMPARE(media.request(), request); +#if QT_DEPRECATED_SINCE(6, 0) QCOMPARE(media.canonicalUrl(), QUrl("http://example.com/movie.mov")); QCOMPARE(media.canonicalRequest(),request); QCOMPARE(media.canonicalResource().request(), request); QCOMPARE(media.canonicalResource().url(), QUrl("http://example.com/movie.mov")); +#endif } +#if QT_DEPRECATED_SINCE(6, 0) void tst_QMediaContent::testResourceCtor() { QMediaContent media(QMediaResource(QUrl("http://example.com/movie.mov"))); @@ -100,10 +115,11 @@ void tst_QMediaContent::testResourceListCtor() QCOMPARE(media.canonicalUrl(), QUrl("http://example.com/movie.mov")); QCOMPARE(media.canonicalResource().url(), QUrl("http://example.com/movie.mov")); } +#endif void tst_QMediaContent::testCopy() { - QMediaContent media1(QMediaResource(QUrl("http://example.com/movie.mov"))); + QMediaContent media1(QUrl("http://example.com/movie.mov")); QMediaContent media2(media1); QVERIFY(media1 == media2); @@ -111,7 +127,7 @@ void tst_QMediaContent::testCopy() void tst_QMediaContent::testAssignment() { - QMediaContent media1(QMediaResource(QUrl("http://example.com/movie.mov"))); + QMediaContent media1(QUrl("http://example.com/movie.mov")); QMediaContent media2; QMediaContent media3; @@ -126,9 +142,9 @@ void tst_QMediaContent::testEquality() { QMediaContent media1; QMediaContent media2; - QMediaContent media3(QMediaResource(QUrl("http://example.com/movie.mov"))); - QMediaContent media4(QMediaResource(QUrl("http://example.com/movie.mov"))); - QMediaContent media5(QMediaResource(QUrl("file:///some/where/over/the/rainbow.mp3"))); + QMediaContent media3(QUrl("http://example.com/movie.mov")); + QMediaContent media4(QUrl("http://example.com/movie.mov")); + QMediaContent media5(QUrl("file:///some/where/over/the/rainbow.mp3")); // null == null QCOMPARE(media1 == media2, true); @@ -147,6 +163,7 @@ void tst_QMediaContent::testEquality() QCOMPARE(media4 != media5, true); } +#if QT_DEPRECATED_SINCE(6, 0) void tst_QMediaContent::testResources() { QMediaResourceList resourceList; @@ -160,17 +177,18 @@ void tst_QMediaContent::testResources() QCOMPARE(res[0], QMediaResource(QUrl("http://example.com/movie-main.mov"))); QCOMPARE(res[1], QMediaResource(QUrl("http://example.com/movie-big.mov"))); } +#endif void tst_QMediaContent::testPlaylist() { QMediaContent media(QUrl("http://example.com/movie.mov")); - QVERIFY(media.canonicalUrl().isValid()); + QVERIFY(media.request().url().isValid()); QVERIFY(!media.playlist()); { QPointer<QMediaPlaylist> playlist(new QMediaPlaylist); media = QMediaContent(playlist.data(), QUrl("http://example.com/sample.m3u"), true); - QVERIFY(media.canonicalUrl().isValid()); + QVERIFY(media.request().url().isValid()); QCOMPARE(media.playlist(), playlist.data()); media = QMediaContent(); // Make sure playlist is destroyed by QMediaContent @@ -189,7 +207,7 @@ void tst_QMediaContent::testPlaylist() { QPointer<QMediaPlaylist> playlist(new QMediaPlaylist); media = QMediaContent(playlist.data(), QUrl(), false); - QVERIFY(!media.canonicalUrl().isValid()); + QVERIFY(!media.request().url().isValid()); QCOMPARE(media.playlist(), playlist.data()); media = QMediaContent(); QVERIFY(playlist); diff --git a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp index 871ff3cc7..f2b993722 100644 --- a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp +++ b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp @@ -1293,7 +1293,7 @@ void tst_QMediaPlayer::testQrc() } // Check the media actually passed to the backend - QCOMPARE(mockService->mockControl->media().canonicalUrl().scheme(), backendMediaContentScheme); + QCOMPARE(mockService->mockControl->media().request().url().scheme(), backendMediaContentScheme); QCOMPARE(bool(mockService->mockControl->mediaStream()), backendHasStream); } diff --git a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp index 3a59823ca..9b1385dac 100644 --- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp +++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp @@ -542,19 +542,19 @@ void tst_QMediaPlaylist::loadM3uFile() QCOMPARE(playlist.error(), QMediaPlaylist::NoError); QCOMPARE(playlist.mediaCount(), 7); - QCOMPARE(playlist.media(0).canonicalUrl(), QUrl(QLatin1String("http://test.host/path"))); - QCOMPARE(playlist.media(1).canonicalUrl(), QUrl(QLatin1String("http://test.host/path"))); + QCOMPARE(playlist.media(0).request().url(), QUrl(QLatin1String("http://test.host/path"))); + QCOMPARE(playlist.media(1).request().url(), QUrl(QLatin1String("http://test.host/path"))); testFileName = QFINDTESTDATA("testdata/testfile"); - QCOMPARE(playlist.media(2).canonicalUrl(), + QCOMPARE(playlist.media(2).request().url(), QUrl::fromLocalFile(testFileName)); testFileName = QFINDTESTDATA("testdata"); - QCOMPARE(playlist.media(3).canonicalUrl(), + QCOMPARE(playlist.media(3).request().url(), QUrl::fromLocalFile(testFileName + "/testdir/testfile")); - QCOMPARE(playlist.media(4).canonicalUrl(), QUrl(QLatin1String("file:///testdir/testfile"))); - QCOMPARE(playlist.media(5).canonicalUrl(), QUrl(QLatin1String("file://path/name#suffix"))); + QCOMPARE(playlist.media(4).request().url(), QUrl(QLatin1String("file:///testdir/testfile"))); + QCOMPARE(playlist.media(5).request().url(), QUrl(QLatin1String("file://path/name#suffix"))); //ensure #2 suffix is not stripped from path testFileName = QFINDTESTDATA("testdata/testfile2#suffix"); - QCOMPARE(playlist.media(6).canonicalUrl(), QUrl::fromLocalFile(testFileName)); + QCOMPARE(playlist.media(6).request().url(), QUrl::fromLocalFile(testFileName)); // check ability to load from QNetworkRequest loadSpy.clear(); @@ -597,19 +597,19 @@ void tst_QMediaPlaylist::loadPLSFile() QCOMPARE(playlist.error(), QMediaPlaylist::NoError); QCOMPARE(playlist.mediaCount(), 7); - QCOMPARE(playlist.media(0).canonicalUrl(), QUrl(QLatin1String("http://test.host/path"))); - QCOMPARE(playlist.media(1).canonicalUrl(), QUrl(QLatin1String("http://test.host/path"))); + QCOMPARE(playlist.media(0).request().url(), QUrl(QLatin1String("http://test.host/path"))); + QCOMPARE(playlist.media(1).request().url(), QUrl(QLatin1String("http://test.host/path"))); testFileName = QFINDTESTDATA("testdata/testfile"); - QCOMPARE(playlist.media(2).canonicalUrl(), + QCOMPARE(playlist.media(2).request().url(), QUrl::fromLocalFile(testFileName)); testFileName = QFINDTESTDATA("testdata"); - QCOMPARE(playlist.media(3).canonicalUrl(), + QCOMPARE(playlist.media(3).request().url(), QUrl::fromLocalFile(testFileName + "/testdir/testfile")); - QCOMPARE(playlist.media(4).canonicalUrl(), QUrl(QLatin1String("file:///testdir/testfile"))); - QCOMPARE(playlist.media(5).canonicalUrl(), QUrl(QLatin1String("file://path/name#suffix"))); + QCOMPARE(playlist.media(4).request().url(), QUrl(QLatin1String("file:///testdir/testfile"))); + QCOMPARE(playlist.media(5).request().url(), QUrl(QLatin1String("file://path/name#suffix"))); //ensure #2 suffix is not stripped from path testFileName = QFINDTESTDATA("testdata/testfile2#suffix"); - QCOMPARE(playlist.media(6).canonicalUrl(), QUrl::fromLocalFile(testFileName)); + QCOMPARE(playlist.media(6).request().url(), QUrl::fromLocalFile(testFileName)); // Try to load a totem-pl generated playlist // (Format doesn't respect the spec) @@ -622,7 +622,7 @@ void tst_QMediaPlaylist::loadPLSFile() QVERIFY(loadFailedSpy.isEmpty()); QCOMPARE(playlist.error(), QMediaPlaylist::NoError); QCOMPARE(playlist.mediaCount(), 1); - QCOMPARE(playlist.media(0).canonicalUrl(), QUrl(QLatin1String("http://test.host/path"))); + QCOMPARE(playlist.media(0).request().url(), QUrl(QLatin1String("http://test.host/path"))); // check ability to load from QNetworkRequest diff --git a/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp b/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp index cfb6b44e9..786570bec 100644 --- a/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp +++ b/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp @@ -37,6 +37,7 @@ class tst_QMediaResource : public QObject { Q_OBJECT private slots: +#if QT_DEPRECATED_SINCE(6, 0) void constructNull(); void construct_data(); void construct(); @@ -47,8 +48,15 @@ private slots: void constructorRequest(); void copyConstructor(); +#else + void initTestCase() + { + QSKIP("Skipping this test, QMediaResource is deprecated."); + } +#endif }; +#if QT_DEPRECATED_SINCE(6, 0) void tst_QMediaResource::constructNull() { QMediaResource resource; @@ -682,6 +690,8 @@ void tst_QMediaResource::copyConstructor() QCOMPARE(original1 == copy1, true); } +#endif // QT_DEPRECATED_SINCE(6, 0) + QTEST_MAIN(tst_QMediaResource) #include "tst_qmediaresource.moc" diff --git a/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h b/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h index 229f70ea8..cc56e9adb 100644 --- a/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h @@ -82,7 +82,8 @@ public: bool bMediaContentChanged = false; int i = 0; for (; i < playlistProvider()->mediaCount(); i++) { - if (playlistProvider()->media(i).canonicalUrl().toString() != newProvider->media(i).canonicalUrl().toString()) { + if (playlistProvider()->media(i).request().url().toString() + != newProvider->media(i).request().url().toString()) { bMediaContentChanged = true; break; } |