summaryrefslogtreecommitdiffstats
path: root/src/qtmultimediaquicktools
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@theqtcompany.com>2016-01-15 17:27:32 +0100
committerChristian Strømme <christian.stromme@theqtcompany.com>2016-01-15 17:28:17 +0100
commit84e426c3af2a3bb1b7f916e54263aea758db38d0 (patch)
tree4fe09a8da5b15ba466e5771239d06f29a6c123da /src/qtmultimediaquicktools
parent84aaa48fdfc1f35c9870518a3d4b6f08a1f99449 (diff)
parent924dc7f48c7003b46079623738ae531f34aed903 (diff)
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts: src/plugins/android/src/mediacapture/qandroidcamerasession.cpp src/plugins/wmf/mftvideo.cpp Change-Id: I78868b416ea4baec89ca3e2dc9eb4712db16d5fc
Diffstat (limited to 'src/qtmultimediaquicktools')
-rw-r--r--src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h8
-rw-r--r--src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h2
-rw-r--r--src/qtmultimediaquicktools/qsgvideonode_p.cpp4
-rw-r--r--src/qtmultimediaquicktools/qsgvideonode_rgb.cpp2
-rw-r--r--src/qtmultimediaquicktools/qsgvideonode_rgb_p.h (renamed from src/qtmultimediaquicktools/qsgvideonode_rgb.h)11
-rw-r--r--src/qtmultimediaquicktools/qsgvideonode_texture.cpp2
-rw-r--r--src/qtmultimediaquicktools/qsgvideonode_texture_p.h (renamed from src/qtmultimediaquicktools/qsgvideonode_texture.h)11
-rw-r--r--src/qtmultimediaquicktools/qsgvideonode_yuv.cpp2
-rw-r--r--src/qtmultimediaquicktools/qsgvideonode_yuv_p.h (renamed from src/qtmultimediaquicktools/qsgvideonode_yuv.h)11
-rw-r--r--src/qtmultimediaquicktools/qtmultimediaquicktools.pro25
10 files changed, 58 insertions, 20 deletions
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 <private/qdeclarativevideooutput_backend_p.h>
+#include <private/qsgvideonode_yuv_p.h>
+#include <private/qsgvideonode_rgb_p.h>
+#include <private/qsgvideonode_texture_p.h>
#include <QtCore/qmutex.h>
#include <QtMultimedia/qabstractvideosurface.h>
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 <private/qdeclarativevideooutput_backend_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/qtmultimediaquicktools/qsgvideonode_p.cpp b/src/qtmultimediaquicktools/qsgvideonode_p.cpp
index 0fb4239d6..28d11e239 100644
--- a/src/qtmultimediaquicktools/qsgvideonode_p.cpp
+++ b/src/qtmultimediaquicktools/qsgvideonode_p.cpp
@@ -118,4 +118,8 @@ void QSGVideoNode::setTexturedRectGeometry(const QRectF &rect, const QRectF &tex
markDirty(DirtyGeometry);
}
+QSGVideoNodeFactoryInterface::~QSGVideoNodeFactoryInterface()
+{
+}
+
QT_END_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 <QtQuick/qsgtexturematerial.h>
#include <QtQuick/qsgmaterial.h>
#include <QtCore/qmutex.h>
diff --git a/src/qtmultimediaquicktools/qsgvideonode_rgb.h b/src/qtmultimediaquicktools/qsgvideonode_rgb_p.h
index 77d11b6d8..501df9cbc 100644
--- a/src/qtmultimediaquicktools/qsgvideonode_rgb.h
+++ b/src/qtmultimediaquicktools/qsgvideonode_rgb_p.h
@@ -34,6 +34,17 @@
#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 <private/qsgvideonode_p.h>
#include <QtMultimedia/qvideosurfaceformat.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 <QtQuick/qsgtexturematerial.h>
#include <QtQuick/qsgmaterial.h>
#include <QtCore/qmutex.h>
diff --git a/src/qtmultimediaquicktools/qsgvideonode_texture.h b/src/qtmultimediaquicktools/qsgvideonode_texture_p.h
index 0849c574f..0304b2efe 100644
--- a/src/qtmultimediaquicktools/qsgvideonode_texture.h
+++ b/src/qtmultimediaquicktools/qsgvideonode_texture_p.h
@@ -34,6 +34,17 @@
#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 <private/qsgvideonode_p.h>
#include <QtMultimedia/qvideosurfaceformat.h>
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 <QtCore/qmutex.h>
#include <QtQuick/qsgtexturematerial.h>
#include <QtQuick/qsgmaterial.h>
diff --git a/src/qtmultimediaquicktools/qsgvideonode_yuv.h b/src/qtmultimediaquicktools/qsgvideonode_yuv_p.h
index 776f0a5a2..9c0a1f36a 100644
--- a/src/qtmultimediaquicktools/qsgvideonode_yuv.h
+++ b/src/qtmultimediaquicktools/qsgvideonode_yuv_p.h
@@ -34,6 +34,17 @@
#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 <private/qsgvideonode_p.h>
#include <QtMultimedia/qvideosurfaceformat.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