slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use QPointer instead of QWeakPointer to track QObjects.

Browse Source 
The latter is to be deprecated.

Change-Id: I01998be880feba0819a9bc51f9bec48fd4601789
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Stephen Kelly
2012-06-06 11:39:59 +02:00
committed by Qt by Nokia
parent 487010e579
commit b93032a7df
6 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/unit/qmediacontent/tst_qmediacontent.cpp
View File

@@ -181,7 +181,7 @@ void tst_QMediaContent::testPlaylist()
QVERIFY(!media.playlist());
{
QWeakPointer<QMediaPlaylist> playlist(new QMediaPlaylist);
QPointer<QMediaPlaylist> playlist(new QMediaPlaylist);
media = QMediaContent(playlist.data(), QUrl("http://example.com/sample.m3u"), true);
QVERIFY(media.canonicalUrl().isValid());
QCOMPARE(media.playlist(), playlist.data());
@@ -200,7 +200,7 @@ void tst_QMediaContent::testPlaylist()
}
{
QWeakPointer<QMediaPlaylist> playlist(new QMediaPlaylist);
QPointer<QMediaPlaylist> playlist(new QMediaPlaylist);
media = QMediaContent(playlist.data(), QUrl(), false);
QVERIFY(!media.canonicalUrl().isValid());
QCOMPARE(media.playlist(), playlist.data());