summaryrefslogtreecommitdiffstats
path: root/src/multimedia/playback/qmediacontent.cpp
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-06-06 11:39:59 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-07 02:17:22 +0200
commitb93032a7df149b5b92910ae968edde672f35d4ac (patch)
tree573c2ac05ef7d4246268e7bf3b33e7f761e868e8 /src/multimedia/playback/qmediacontent.cpp
parent487010e5797da8634cdec44e94b5476695c1bd15 (diff)
Use QPointer instead of QWeakPointer to track QObjects.
The latter is to be deprecated. Change-Id: I01998be880feba0819a9bc51f9bec48fd4601789 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'src/multimedia/playback/qmediacontent.cpp')
-rw-r--r--src/multimedia/playback/qmediacontent.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/playback/qmediacontent.cpp b/src/multimedia/playback/qmediacontent.cpp
index 641c7a485..ad2e2f6ac 100644
--- a/src/multimedia/playback/qmediacontent.cpp
+++ b/src/multimedia/playback/qmediacontent.cpp
@@ -41,7 +41,7 @@
#include <QtCore/qurl.h>
#include <QtCore/qvariant.h>
-#include <QtCore/QWeakPointer>
+#include <QtCore/QPointer>
#include <qmediaplaylist.h>
#include "qmediacontent.h"
@@ -100,7 +100,7 @@ public:
QMediaResourceList resources;
- QWeakPointer<QMediaPlaylist> playlist;
+ QPointer<QMediaPlaylist> playlist;
bool isPlaylistOwned;
private:
QMediaContentPrivate& operator=(const QMediaContentPrivate &other);