Merge lp:~timo-jyrinki/qtvideo-node/port_to_qt56 into lp:qtvideo-node

Proposed by Timo Jyrinki on 2016-04-20
Status: Merged
Approved by: Jim Hodapp on 2016-07-25
Approved revision: 68
Merged at revision: 70
Proposed branch: lp:~timo-jyrinki/qtvideo-node/port_to_qt56
Merge into: lp:qtvideo-node
Diff against target: 71 lines (+23/-0)
4 files modified
src/qsgvideonode_p.cpp (+4/-0)
src/qsgvideonode_p.h (+13/-0)
src/shadervideonodeplugin.cpp (+5/-0)
src/shadervideonodeplugin.h (+1/-0)
To merge this branch: bzr merge lp:~timo-jyrinki/qtvideo-node/port_to_qt56
Reviewer Review Type Date Requested Status
Jim Hodapp (community) code 2016-07-21 Approve on 2016-07-25
PS Jenkins bot continuous-integration Needs Fixing on 2016-04-20
Ubuntu Phablet Team 2016-04-20 Pending
Review via email: mp+292369@code.launchpad.net

Commit message

Port to Qt 5.6.

To post a comment you must log in.
Timo Jyrinki (timo-jyrinki) wrote :

Seems to fix the issue for me.

Jim Hodapp (jhodapp) wrote :

LGTM

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qsgvideonode_p.cpp'
2--- src/qsgvideonode_p.cpp 2015-10-08 07:10:45 +0000
3+++ src/qsgvideonode_p.cpp 2016-04-20 11:50:37 +0000
4@@ -118,4 +118,8 @@
5 markDirty(DirtyGeometry);
6 }
7
8+QSGVideoNodeFactoryInterface::~QSGVideoNodeFactoryInterface()
9+{
10+}
11+
12 QT_END_NAMESPACE
13
14=== modified file 'src/qsgvideonode_p.h'
15--- src/qsgvideonode_p.h 2015-10-08 07:10:45 +0000
16+++ src/qsgvideonode_p.h 2016-04-20 11:50:37 +0000
17@@ -34,6 +34,17 @@
18 #ifndef QSGVIDEONODE_P_H
19 #define QSGVIDEONODE_P_H
20
21+//
22+// W A R N I N G
23+// -------------
24+//
25+// This file is not part of the Qt API. It exists purely as an
26+// implementation detail. This header file may change from version to
27+// version without notice, or even be removed.
28+//
29+// We mean it.
30+//
31+
32 #include <QtQuick/qsgnode.h>
33 #include <private/qtmultimediaquickdefs_p.h>
34
35@@ -70,6 +81,8 @@
36 class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNodeFactoryInterface
37 {
38 public:
39+ virtual ~QSGVideoNodeFactoryInterface();
40+
41 virtual QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const = 0;
42 virtual QSGVideoNode *createNode(const QVideoSurfaceFormat &format) = 0;
43 };
44
45=== modified file 'src/shadervideonodeplugin.cpp'
46--- src/shadervideonodeplugin.cpp 2013-09-10 13:28:07 +0000
47+++ src/shadervideonodeplugin.cpp 2016-04-20 11:50:37 +0000
48@@ -19,6 +19,11 @@
49
50 #include <QtCore/qdebug.h>
51
52+ShaderVideoNodePlugin::~ShaderVideoNodePlugin()
53+{
54+}
55+
56+
57 QList<QVideoFrame::PixelFormat> ShaderVideoNodePlugin::supportedPixelFormats(
58 QAbstractVideoBuffer::HandleType handleType) const
59 {
60
61=== modified file 'src/shadervideonodeplugin.h'
62--- src/shadervideonodeplugin.h 2015-10-08 07:10:45 +0000
63+++ src/shadervideonodeplugin.h 2016-04-20 11:50:37 +0000
64@@ -27,6 +27,7 @@
65 Q_PLUGIN_METADATA(IID "org.qt-project.qt.sgvideonodefactory/5.2" FILE "shadervideonode.json")
66
67 public:
68+ ~ShaderVideoNodePlugin();
69 QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const;
70 QSGVideoNode *createNode(const QVideoSurfaceFormat &format);
71 };

Subscribers

People subscribed via source and target branches