From 8aa31a38cb89cae2a4cbd37d973a611512093233 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Tue, 24 Nov 2015 15:51:59 +0100 Subject: Fix some private headers. - Add missing "We mean it" comment - Add missing '_p' suffix for QtMultimediaQuick_p headers Task-number: QTBUG-49480 Change-Id: I1fd4f8b2fdffecebaebaedaf1b78e1da62c08156 Reviewed-by: Friedemann Kleint --- .../video/qvideoframeconversionhelper_p.h | 11 +++ .../qdeclarativevideooutput_render_p.h | 8 +-- .../qdeclarativevideooutput_window_p.h | 2 +- src/qtmultimediaquicktools/qsgvideonode_rgb.cpp | 2 +- src/qtmultimediaquicktools/qsgvideonode_rgb.h | 72 ------------------- src/qtmultimediaquicktools/qsgvideonode_rgb_p.h | 83 ++++++++++++++++++++++ .../qsgvideonode_texture.cpp | 2 +- src/qtmultimediaquicktools/qsgvideonode_texture.h | 72 ------------------- .../qsgvideonode_texture_p.h | 83 ++++++++++++++++++++++ src/qtmultimediaquicktools/qsgvideonode_yuv.cpp | 2 +- src/qtmultimediaquicktools/qsgvideonode_yuv.h | 72 ------------------- src/qtmultimediaquicktools/qsgvideonode_yuv_p.h | 83 ++++++++++++++++++++++ .../qtmultimediaquicktools.pro | 25 +++---- 13 files changed, 281 insertions(+), 236 deletions(-) delete mode 100644 src/qtmultimediaquicktools/qsgvideonode_rgb.h create mode 100644 src/qtmultimediaquicktools/qsgvideonode_rgb_p.h delete mode 100644 src/qtmultimediaquicktools/qsgvideonode_texture.h create mode 100644 src/qtmultimediaquicktools/qsgvideonode_texture_p.h delete mode 100644 src/qtmultimediaquicktools/qsgvideonode_yuv.h create mode 100644 src/qtmultimediaquicktools/qsgvideonode_yuv_p.h (limited to 'src') diff --git a/src/multimedia/video/qvideoframeconversionhelper_p.h b/src/multimedia/video/qvideoframeconversionhelper_p.h index eead17a91..10e9d3ab3 100644 --- a/src/multimedia/video/qvideoframeconversionhelper_p.h +++ b/src/multimedia/video/qvideoframeconversionhelper_p.h @@ -34,6 +34,17 @@ #ifndef QVIDEOFRAMECONVERSIONHELPER_P_H #define QVIDEOFRAMECONVERSIONHELPER_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 #include diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h b/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h index d33bc0b11..e05adc3b1 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h @@ -46,10 +46,10 @@ // We mean it. // -#include "qdeclarativevideooutput_backend_p.h" -#include "qsgvideonode_yuv.h" -#include "qsgvideonode_rgb.h" -#include "qsgvideonode_texture.h" +#include +#include +#include +#include #include #include diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h b/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h index 68403852e..a7c5ee810 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include "qdeclarativevideooutput_backend_p.h" +#include QT_BEGIN_NAMESPACE diff --git a/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp b/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp index 5093acb59..1ba8f98bf 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp +++ b/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp @@ -30,7 +30,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qsgvideonode_rgb.h" +#include "qsgvideonode_rgb_p.h" #include #include #include diff --git a/src/qtmultimediaquicktools/qsgvideonode_rgb.h b/src/qtmultimediaquicktools/qsgvideonode_rgb.h deleted file mode 100644 index 77d11b6d8..000000000 --- a/src/qtmultimediaquicktools/qsgvideonode_rgb.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QSGVIDEONODE_RGB_H -#define QSGVIDEONODE_RGB_H - -#include -#include - -QT_BEGIN_NAMESPACE - -class QSGVideoMaterial_RGB; - -class QSGVideoNode_RGB : public QSGVideoNode -{ -public: - QSGVideoNode_RGB(const QVideoSurfaceFormat &format); - ~QSGVideoNode_RGB(); - - virtual QVideoFrame::PixelFormat pixelFormat() const { - return m_format.pixelFormat(); - } - QAbstractVideoBuffer::HandleType handleType() const { - return QAbstractVideoBuffer::NoHandle; - } - void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags); - -private: - QVideoSurfaceFormat m_format; - QSGVideoMaterial_RGB *m_material; - QVideoFrame m_frame; -}; - -class QSGVideoNodeFactory_RGB : public QSGVideoNodeFactoryInterface { -public: - QList supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const; - QSGVideoNode *createNode(const QVideoSurfaceFormat &format); -}; - -QT_END_NAMESPACE - -#endif // QSGVIDEONODE_RGB_H diff --git a/src/qtmultimediaquicktools/qsgvideonode_rgb_p.h b/src/qtmultimediaquicktools/qsgvideonode_rgb_p.h new file mode 100644 index 000000000..501df9cbc --- /dev/null +++ b/src/qtmultimediaquicktools/qsgvideonode_rgb_p.h @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QSGVIDEONODE_RGB_H +#define QSGVIDEONODE_RGB_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 +#include + +QT_BEGIN_NAMESPACE + +class QSGVideoMaterial_RGB; + +class QSGVideoNode_RGB : public QSGVideoNode +{ +public: + QSGVideoNode_RGB(const QVideoSurfaceFormat &format); + ~QSGVideoNode_RGB(); + + virtual QVideoFrame::PixelFormat pixelFormat() const { + return m_format.pixelFormat(); + } + QAbstractVideoBuffer::HandleType handleType() const { + return QAbstractVideoBuffer::NoHandle; + } + void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags); + +private: + QVideoSurfaceFormat m_format; + QSGVideoMaterial_RGB *m_material; + QVideoFrame m_frame; +}; + +class QSGVideoNodeFactory_RGB : public QSGVideoNodeFactoryInterface { +public: + QList supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const; + QSGVideoNode *createNode(const QVideoSurfaceFormat &format); +}; + +QT_END_NAMESPACE + +#endif // QSGVIDEONODE_RGB_H diff --git a/src/qtmultimediaquicktools/qsgvideonode_texture.cpp b/src/qtmultimediaquicktools/qsgvideonode_texture.cpp index 500c1c62f..1170af792 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_texture.cpp +++ b/src/qtmultimediaquicktools/qsgvideonode_texture.cpp @@ -30,7 +30,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qsgvideonode_texture.h" +#include "qsgvideonode_texture_p.h" #include #include #include diff --git a/src/qtmultimediaquicktools/qsgvideonode_texture.h b/src/qtmultimediaquicktools/qsgvideonode_texture.h deleted file mode 100644 index 0849c574f..000000000 --- a/src/qtmultimediaquicktools/qsgvideonode_texture.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QSGVIDEONODE_TEXTURE_H -#define QSGVIDEONODE_TEXTURE_H - -#include -#include - -QT_BEGIN_NAMESPACE - -class QSGVideoMaterial_Texture; - -class QSGVideoNode_Texture : public QSGVideoNode -{ -public: - QSGVideoNode_Texture(const QVideoSurfaceFormat &format); - ~QSGVideoNode_Texture(); - - virtual QVideoFrame::PixelFormat pixelFormat() const { - return m_format.pixelFormat(); - } - QAbstractVideoBuffer::HandleType handleType() const { - return QAbstractVideoBuffer::GLTextureHandle; - } - void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags); - -private: - QVideoSurfaceFormat m_format; - QSGVideoMaterial_Texture *m_material; - QVideoFrame m_frame; -}; - -class QSGVideoNodeFactory_Texture : public QSGVideoNodeFactoryInterface { -public: - QList supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const; - QSGVideoNode *createNode(const QVideoSurfaceFormat &format); -}; - -QT_END_NAMESPACE - -#endif diff --git a/src/qtmultimediaquicktools/qsgvideonode_texture_p.h b/src/qtmultimediaquicktools/qsgvideonode_texture_p.h new file mode 100644 index 000000000..0304b2efe --- /dev/null +++ b/src/qtmultimediaquicktools/qsgvideonode_texture_p.h @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QSGVIDEONODE_TEXTURE_H +#define QSGVIDEONODE_TEXTURE_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 +#include + +QT_BEGIN_NAMESPACE + +class QSGVideoMaterial_Texture; + +class QSGVideoNode_Texture : public QSGVideoNode +{ +public: + QSGVideoNode_Texture(const QVideoSurfaceFormat &format); + ~QSGVideoNode_Texture(); + + virtual QVideoFrame::PixelFormat pixelFormat() const { + return m_format.pixelFormat(); + } + QAbstractVideoBuffer::HandleType handleType() const { + return QAbstractVideoBuffer::GLTextureHandle; + } + void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags); + +private: + QVideoSurfaceFormat m_format; + QSGVideoMaterial_Texture *m_material; + QVideoFrame m_frame; +}; + +class QSGVideoNodeFactory_Texture : public QSGVideoNodeFactoryInterface { +public: + QList supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const; + QSGVideoNode *createNode(const QVideoSurfaceFormat &format); +}; + +QT_END_NAMESPACE + +#endif diff --git a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp index af1e98cdf..b2979f50b 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp +++ b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp @@ -30,7 +30,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qsgvideonode_yuv.h" +#include "qsgvideonode_yuv_p.h" #include #include #include diff --git a/src/qtmultimediaquicktools/qsgvideonode_yuv.h b/src/qtmultimediaquicktools/qsgvideonode_yuv.h deleted file mode 100644 index 776f0a5a2..000000000 --- a/src/qtmultimediaquicktools/qsgvideonode_yuv.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QSGVIDEONODE_YUV_H -#define QSGVIDEONODE_YUV_H - -#include -#include - -QT_BEGIN_NAMESPACE - -class QSGVideoMaterial_YUV; -class QSGVideoNode_YUV : public QSGVideoNode -{ -public: - QSGVideoNode_YUV(const QVideoSurfaceFormat &format); - ~QSGVideoNode_YUV(); - - virtual QVideoFrame::PixelFormat pixelFormat() const { - return m_format.pixelFormat(); - } - QAbstractVideoBuffer::HandleType handleType() const { - return QAbstractVideoBuffer::NoHandle; - } - void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags); - -private: - void bindTexture(int id, int unit, int w, int h, const uchar *bits); - - QVideoSurfaceFormat m_format; - QSGVideoMaterial_YUV *m_material; -}; - -class QSGVideoNodeFactory_YUV : public QSGVideoNodeFactoryInterface { -public: - QList supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const; - QSGVideoNode *createNode(const QVideoSurfaceFormat &format); -}; - -QT_END_NAMESPACE - -#endif // QSGVIDEONODE_YUV_H diff --git a/src/qtmultimediaquicktools/qsgvideonode_yuv_p.h b/src/qtmultimediaquicktools/qsgvideonode_yuv_p.h new file mode 100644 index 000000000..9c0a1f36a --- /dev/null +++ b/src/qtmultimediaquicktools/qsgvideonode_yuv_p.h @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QSGVIDEONODE_YUV_H +#define QSGVIDEONODE_YUV_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 +#include + +QT_BEGIN_NAMESPACE + +class QSGVideoMaterial_YUV; +class QSGVideoNode_YUV : public QSGVideoNode +{ +public: + QSGVideoNode_YUV(const QVideoSurfaceFormat &format); + ~QSGVideoNode_YUV(); + + virtual QVideoFrame::PixelFormat pixelFormat() const { + return m_format.pixelFormat(); + } + QAbstractVideoBuffer::HandleType handleType() const { + return QAbstractVideoBuffer::NoHandle; + } + void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags); + +private: + void bindTexture(int id, int unit, int w, int h, const uchar *bits); + + QVideoSurfaceFormat m_format; + QSGVideoMaterial_YUV *m_material; +}; + +class QSGVideoNodeFactory_YUV : public QSGVideoNodeFactoryInterface { +public: + QList supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const; + QSGVideoNode *createNode(const QVideoSurfaceFormat &format); +}; + +QT_END_NAMESPACE + +#endif // QSGVIDEONODE_YUV_H diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro index 61c5f7b20..b38f209e3 100644 --- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro +++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro @@ -9,12 +9,21 @@ DEFINES += QT_BUILD_QTMM_QUICK_LIB # Header files must go inside source directory of a module # to be installed by syncqt. INCLUDEPATH += ../multimedia/qtmultimediaquicktools_headers/ +VPATH += ../multimedia/qtmultimediaquicktools_headers/ PRIVATE_HEADERS += \ - ../multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h \ - ../multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_backend_p.h \ - ../multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h \ - ../multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h + qdeclarativevideooutput_p.h \ + qdeclarativevideooutput_backend_p.h \ + qsgvideonode_p.h \ + qtmultimediaquickdefs_p.h + +HEADERS += \ + $$PRIVATE_HEADERS \ + qdeclarativevideooutput_render_p.h \ + qdeclarativevideooutput_window_p.h \ + qsgvideonode_yuv_p.h \ + qsgvideonode_rgb_p.h \ + qsgvideonode_texture_p.h SOURCES += \ qsgvideonode_p.cpp \ @@ -25,14 +34,6 @@ SOURCES += \ qsgvideonode_rgb.cpp \ qsgvideonode_texture.cpp -HEADERS += \ - $$PRIVATE_HEADERS \ - qdeclarativevideooutput_render_p.h \ - qdeclarativevideooutput_window_p.h \ - qsgvideonode_yuv.h \ - qsgvideonode_rgb.h \ - qsgvideonode_texture.h - RESOURCES += \ qtmultimediaquicktools.qrc -- cgit v1.2.3