Add virtual destructors to QMediaObjectPrivate and QMediaServicePrivate.

This reverts aec0628295cda95f2169e3007368797ba6585ee3 and fixes the
actual problem, which is the destructors for for classes inheriting
QMediaObjectPrivate weren't being called resulting in QPointer
destructors also not being called.

3 files changed, 2 insertions, 2 deletions

diff --git a/src/multimedia/base/qmediaobject_p.h b/src/multimedia/base/qmediaobject_p.h
index 4bbe06a..ec2f75a 100644
--- a/src/multimedia/base/qmediaobject_p.h
+++ b/src/multimedia/base/qmediaobject_p.h
@@ -76,6 +76,7 @@ class QMediaObjectPrivate
 
 public:
     QMediaObjectPrivate():metaDataControl(0), notifyTimer(0) {}
+    virtual ~QMediaObjectPrivate() {}
 
     void _q_notify();
 
diff --git a/src/multimedia/base/qmediaservice_p.h b/src/multimedia/base/qmediaservice_p.h
index 5993a7e..7dbcd8a 100644
--- a/src/multimedia/base/qmediaservice_p.h
+++ b/src/multimedia/base/qmediaservice_p.h
@@ -63,6 +63,7 @@ class QMediaServicePrivate
 {
 public:
     QMediaServicePrivate(): q_ptr(0) {}
+    virtual ~QMediaServicePrivate() {}
 
     QMediaService *q_ptr;
 };
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index d3dfbb2..0853597 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -308,8 +308,6 @@ QMediaPlayer::~QMediaPlayer()
     Q_D(QMediaPlayer);
 
     d->provider->releaseService(d->service);
-    d->videoWidget = 0;
-    d->videoItem = 0;
 }
 
 QMediaContent QMediaPlayer::media() const