summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/imports/multimedia/qdeclarativevideooutput.cpp2
-rw-r--r--src/imports/multimedia/qdeclarativevideooutput_p.h2
-rw-r--r--src/imports/multimedia/qsgvideonode_i420.cpp4
-rw-r--r--src/imports/multimedia/qsgvideonode_p.h2
-rw-r--r--src/imports/multimedia/qsgvideonode_rgb.cpp4
-rw-r--r--src/multimedia/audio/qsoundeffect.h2
-rw-r--r--src/plugins/gstreamer/qgstreamervideowindow.cpp2
7 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp
index 722e3077b..cea3dcc47 100644
--- a/src/imports/multimedia/qdeclarativevideooutput.cpp
+++ b/src/imports/multimedia/qdeclarativevideooutput.cpp
@@ -44,7 +44,7 @@
#include "qsgvideonode_i420.h"
#include "qsgvideonode_rgb.h"
-#include <qquickitem.h>
+#include <QtQuick/QQuickItem>
#include <QtMultimedia/QAbstractVideoSurface>
#include <QtMultimedia/qmediaservice.h>
diff --git a/src/imports/multimedia/qdeclarativevideooutput_p.h b/src/imports/multimedia/qdeclarativevideooutput_p.h
index 6b990f72f..5a7b6aa05 100644
--- a/src/imports/multimedia/qdeclarativevideooutput_p.h
+++ b/src/imports/multimedia/qdeclarativevideooutput_p.h
@@ -42,7 +42,7 @@
#ifndef QDECLARATIVEVIDEOOUTPUT_P_H
#define QDECLARATIVEVIDEOOUTPUT_P_H
-#include <qquickitem.h>
+#include <QtQuick/QQuickItem>
#include <QtMultimedia/qvideoframe.h>
#include <QtMultimedia/qmediaobject.h>
diff --git a/src/imports/multimedia/qsgvideonode_i420.cpp b/src/imports/multimedia/qsgvideonode_i420.cpp
index 2faa89550..d414b79e3 100644
--- a/src/imports/multimedia/qsgvideonode_i420.cpp
+++ b/src/imports/multimedia/qsgvideonode_i420.cpp
@@ -40,8 +40,8 @@
****************************************************************************/
#include "qsgvideonode_i420.h"
#include <QtCore/qmutex.h>
-#include <qsgtexturematerial.h>
-#include <qsgmaterial.h>
+#include <QtQuick/qsgtexturematerial.h>
+#include <QtQuick/qsgmaterial.h>
#include <QtGui/QOpenGLContext>
#include <QtGui/QOpenGLFunctions>
#include <QtOpenGL/qglshaderprogram.h>
diff --git a/src/imports/multimedia/qsgvideonode_p.h b/src/imports/multimedia/qsgvideonode_p.h
index 67a4c0d5f..595623fa6 100644
--- a/src/imports/multimedia/qsgvideonode_p.h
+++ b/src/imports/multimedia/qsgvideonode_p.h
@@ -42,7 +42,7 @@
#ifndef QSGVIDEONODE_P_H
#define QSGVIDEONODE_P_H
-#include <qsgnode.h>
+#include <QtQuick/qsgnode.h>
#include <QtMultimedia/qvideoframe.h>
#include <QtMultimedia/qvideosurfaceformat.h>
diff --git a/src/imports/multimedia/qsgvideonode_rgb.cpp b/src/imports/multimedia/qsgvideonode_rgb.cpp
index 5f0fe821c..94206762b 100644
--- a/src/imports/multimedia/qsgvideonode_rgb.cpp
+++ b/src/imports/multimedia/qsgvideonode_rgb.cpp
@@ -39,8 +39,8 @@
**
****************************************************************************/
#include "qsgvideonode_rgb.h"
-#include <qsgtexturematerial.h>
-#include <qsgmaterial.h>
+#include <QtQuick/qsgtexturematerial.h>
+#include <QtQuick/qsgmaterial.h>
#include <QtCore/qmutex.h>
#include <QtGui/QOpenGLContext>
#include <QtGui/QOpenGLFunctions>
diff --git a/src/multimedia/audio/qsoundeffect.h b/src/multimedia/audio/qsoundeffect.h
index f5df8328e..3f9f8bdd6 100644
--- a/src/multimedia/audio/qsoundeffect.h
+++ b/src/multimedia/audio/qsoundeffect.h
@@ -74,7 +74,7 @@ class Q_MULTIMEDIA_EXPORT QSoundEffect : public QObject
public:
enum Loop
{
- Infinite = -2,
+ Infinite = -2
};
enum Status
diff --git a/src/plugins/gstreamer/qgstreamervideowindow.cpp b/src/plugins/gstreamer/qgstreamervideowindow.cpp
index dad5e2860..753e0eb24 100644
--- a/src/plugins/gstreamer/qgstreamervideowindow.cpp
+++ b/src/plugins/gstreamer/qgstreamervideowindow.cpp
@@ -313,7 +313,7 @@ QSize QGstreamerVideoWindow::nativeSize() const
return m_nativeSize;
}
-void QGstreamerVideoWindow::padBufferProbe(GstPad *pad, GstBuffer *buffer, gpointer user_data)
+void QGstreamerVideoWindow::padBufferProbe(GstPad *pad, GstBuffer * /* buffer */, gpointer user_data)
{
QGstreamerVideoWindow *control = reinterpret_cast<QGstreamerVideoWindow*>(user_data);
QMetaObject::invokeMethod(control, "updateNativeVideoSize", Qt::QueuedConnection);