diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:59:24 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:59:24 +0200 |
| commit | d691f5ca2b6749006673e199b1d668a6daa9b990 (patch) | |
| tree | eacad24192e1e0c492320e14bdfd7c3c203a01e0 /src/multimedia/video/qvideoframe.cpp | |
| parent | d415d3256d055ef6fd7dad5c0497ecfaa56ee64d (diff) | |
| parent | 150ff6662de1312e3ba9d000895d80dd5805ea5b (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: Iecd8d7b94e52a8981526b12cffa40e99870ba62f
Diffstat (limited to 'src/multimedia/video/qvideoframe.cpp')
| -rw-r--r-- | src/multimedia/video/qvideoframe.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index e4ce21361..4a32bc557 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -55,20 +55,15 @@ QT_BEGIN_NAMESPACE -namespace +static void qRegisterVideoFrameMetaTypes() { -class QVideoFramePrivateRegisterMetaTypes -{ -public: - QVideoFramePrivateRegisterMetaTypes() - { - qRegisterMetaType<QVideoFrame>(); - qRegisterMetaType<QVideoFrame::FieldType>(); - qRegisterMetaType<QVideoFrame::PixelFormat>(); - } -} _registerMetaTypes; + qRegisterMetaType<QVideoFrame>(); + qRegisterMetaType<QVideoFrame::FieldType>(); + qRegisterMetaType<QVideoFrame::PixelFormat>(); } +Q_CONSTRUCTOR_FUNCTION(qRegisterVideoFrameMetaTypes) + class QVideoFramePrivate : public QSharedData { |