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

[Timo Jyrinki]

Port to Qt 5.6.

[Timo Jyrinki (timo-jyrinki)]

Seems to fix the issue for me.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/qtvideo-node-ci/70/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtvideo-node-vivid-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtvideo-node-vivid-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtvideo-node-vivid-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtvideo-node-ci/70/rebuild

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

LGTM

review: Approve (code)

=== modified file 'src/qsgvideonode_p.cpp'
--- src/qsgvideonode_p.cpp	2015-10-08 07:10:45 +0000
+++ src/qsgvideonode_p.cpp	2016-04-20 11:50:37 +0000
@@ -118,4 +118,8 @@
     markDirty(DirtyGeometry);
 }
 
+QSGVideoNodeFactoryInterface::~QSGVideoNodeFactoryInterface()
+{
+}
+
 QT_END_NAMESPACE
 
=== modified file 'src/qsgvideonode_p.h'
--- src/qsgvideonode_p.h	2015-10-08 07:10:45 +0000
+++ src/qsgvideonode_p.h	2016-04-20 11:50:37 +0000
@@ -34,6 +34,17 @@
 #ifndef QSGVIDEONODE_P_H
 #define QSGVIDEONODE_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtQuick/qsgnode.h>
 #include <private/qtmultimediaquickdefs_p.h>
 
@@ -70,6 +81,8 @@
 class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNodeFactoryInterface
 {
 public:
+    virtual ~QSGVideoNodeFactoryInterface();
+
     virtual QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const = 0;
     virtual QSGVideoNode *createNode(const QVideoSurfaceFormat &format) = 0;
 };
 
=== modified file 'src/shadervideonodeplugin.cpp'
--- src/shadervideonodeplugin.cpp	2013-09-10 13:28:07 +0000
+++ src/shadervideonodeplugin.cpp	2016-04-20 11:50:37 +0000
@@ -19,6 +19,11 @@
 
 #include <QtCore/qdebug.h>
 
+ShaderVideoNodePlugin::~ShaderVideoNodePlugin()
+{
+}
+
+
 QList<QVideoFrame::PixelFormat> ShaderVideoNodePlugin::supportedPixelFormats(
                                         QAbstractVideoBuffer::HandleType handleType) const
 {
 
=== modified file 'src/shadervideonodeplugin.h'
--- src/shadervideonodeplugin.h	2015-10-08 07:10:45 +0000
+++ src/shadervideonodeplugin.h	2016-04-20 11:50:37 +0000
@@ -27,6 +27,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.qt.sgvideonodefactory/5.2" FILE "shadervideonode.json")
 
 public:
+    ~ShaderVideoNodePlugin();
     QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const;
     QSGVideoNode *createNode(const QVideoSurfaceFormat &format);
 };