summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-18 03:05:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-18 03:05:47 (GMT)
commit4cef0e055f2b519b405f90ce9cfcab90515e443e (patch)
tree9057e89f4fd8509143fbd023280383f0f4219228
parent6e7be2f62affae41a7e9cb717778f4ef24f52c20 (diff)
parent9294eee910ee630657749bbd22ea1e5b836fe00e (diff)
downloadQt-4cef0e055f2b519b405f90ce9cfcab90515e443e.zip
Qt-4cef0e055f2b519b405f90ce9cfcab90515e443e.tar.gz
Qt-4cef0e055f2b519b405f90ce9cfcab90515e443e.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed memory lean in QImageVideoBuffer and QMemoryVideoBuffer.
-rw-r--r--src/multimedia/video/qabstractvideobuffer_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/multimedia/video/qabstractvideobuffer_p.h b/src/multimedia/video/qabstractvideobuffer_p.h
index c72f303..3303b36 100644
--- a/src/multimedia/video/qabstractvideobuffer_p.h
+++ b/src/multimedia/video/qabstractvideobuffer_p.h
@@ -65,6 +65,9 @@ public:
: handleType(QAbstractVideoBuffer::NoHandle)
{}
+ virtual ~QAbstractVideoBufferPrivate()
+ {}
+
QAbstractVideoBuffer::HandleType handleType;
};