summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-06-20 11:15:52 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-06-20 11:15:52 (GMT)
commitf5bab2bc74ed03fd1db99cba3830b6b21795a627 (patch)
treeb10c428a9b482354c5366e920a2a3359b676f82c /src/multimedia
parent489cface92f40f4e82866b5fabf57d29e9632811 (diff)
parenta27f18db247a0456ca15ad58f8dcc6b3441d55d0 (diff)
downloadQt-f5bab2bc74ed03fd1db99cba3830b6b21795a627.zip
Qt-f5bab2bc74ed03fd1db99cba3830b6b21795a627.tar.gz
Qt-f5bab2bc74ed03fd1db99cba3830b6b21795a627.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
src/3rdparty/* is left untouched and not merged from 4.6. The corresponding changes in Harfbuzz and WebKit are already in the 4.6 staging areas. Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/ChangeLog src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.qrc tests/auto/qtextlayout/tst_qtextlayout.cpp tests/auto/qwidgetaction/tst_qwidgetaction.cpp
Diffstat (limited to 'src/multimedia')
-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;
};