From b93032a7df149b5b92910ae968edde672f35d4ac Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Wed, 6 Jun 2012 11:39:59 +0200
Subject: 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>
---
 src/imports/multimedia/qdeclarativevideooutput_p.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/imports/multimedia')

diff --git a/src/imports/multimedia/qdeclarativevideooutput_p.h b/src/imports/multimedia/qdeclarativevideooutput_p.h
index 39cb549b7..42ebd1955 100644
--- a/src/imports/multimedia/qdeclarativevideooutput_p.h
+++ b/src/imports/multimedia/qdeclarativevideooutput_p.h
@@ -46,6 +46,7 @@
 #include <QtCore/qrect.h>
 #include <QtCore/qsharedpointer.h>
 #include <QtQuick/qquickitem.h>
+#include <QtCore/qpointer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -125,9 +126,9 @@ private:
 
     SourceType m_sourceType;
 
-    QWeakPointer<QObject> m_source;
-    QWeakPointer<QMediaObject> m_mediaObject;
-    QWeakPointer<QMediaService> m_service;
+    QPointer<QObject> m_source;
+    QPointer<QMediaObject> m_mediaObject;
+    QPointer<QMediaService> m_service;
 
     FillMode m_fillMode;
     QSize m_nativeSize;
-- 
cgit v1.2.3