slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

QtMultimedia: Fix compiler warnings.

Browse Source 
- Fix deprecated QDeclarative includes.
- Comment out unused parameter.
- Remove trailing comma from enumeration value (Clang)

Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Change-Id: I31d54a12505f4e3a48eb4b7736a48d5dacc2c0d9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-05 08:17:54 +01:00
committed by Qt by Nokia
parent 55c0505a00
commit 3910efbda6
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/imports/multimedia/qdeclarativevideooutput.cpp
View File

@@ -44,7 +44,7 @@
#include "qsgvideonode_i420.h" #include "qsgvideonode_i420.h"
#include "qsgvideonode_rgb.h" #include "qsgvideonode_rgb.h"
#include <qquickitem.h> #include <QtQuick/QQuickItem>
#include <QtMultimedia/QAbstractVideoSurface> #include <QtMultimedia/QAbstractVideoSurface>
#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaservice.h>

2
src/imports/multimedia/qdeclarativevideooutput_p.h
View File

@@ -42,7 +42,7 @@
#ifndef QDECLARATIVEVIDEOOUTPUT_P_H #ifndef QDECLARATIVEVIDEOOUTPUT_P_H
#define QDECLARATIVEVIDEOOUTPUT_P_H #define QDECLARATIVEVIDEOOUTPUT_P_H
#include <qquickitem.h> #include <QtQuick/QQuickItem>
#include <QtMultimedia/qvideoframe.h> #include <QtMultimedia/qvideoframe.h>
#include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qmediaobject.h>

4
src/imports/multimedia/qsgvideonode_i420.cpp
View File

@@ -40,8 +40,8 @@
****************************************************************************/ ****************************************************************************/
#include "qsgvideonode_i420.h" #include "qsgvideonode_i420.h"
#include <QtCore/qmutex.h> #include <QtCore/qmutex.h>
#include <qsgtexturematerial.h> #include <QtQuick/qsgtexturematerial.h>
#include <qsgmaterial.h> #include <QtQuick/qsgmaterial.h>
#include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLContext>
#include <QtGui/QOpenGLFunctions> #include <QtGui/QOpenGLFunctions>
#include <QtOpenGL/qglshaderprogram.h> #include <QtOpenGL/qglshaderprogram.h>

2
src/imports/multimedia/qsgvideonode_p.h
View File

@@ -42,7 +42,7 @@
#ifndef QSGVIDEONODE_P_H #ifndef QSGVIDEONODE_P_H
#define QSGVIDEONODE_P_H #define QSGVIDEONODE_P_H
#include <qsgnode.h> #include <QtQuick/qsgnode.h>
#include <QtMultimedia/qvideoframe.h> #include <QtMultimedia/qvideoframe.h>
#include <QtMultimedia/qvideosurfaceformat.h> #include <QtMultimedia/qvideosurfaceformat.h>

4
src/imports/multimedia/qsgvideonode_rgb.cpp
View File

@@ -39,8 +39,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include "qsgvideonode_rgb.h" #include "qsgvideonode_rgb.h"
#include <qsgtexturematerial.h> #include <QtQuick/qsgtexturematerial.h>
#include <qsgmaterial.h> #include <QtQuick/qsgmaterial.h>
#include <QtCore/qmutex.h> #include <QtCore/qmutex.h>
#include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLContext>
#include <QtGui/QOpenGLFunctions> #include <QtGui/QOpenGLFunctions>

2
src/multimedia/audio/qsoundeffect.h
View File

@@ -74,7 +74,7 @@ class Q_MULTIMEDIA_EXPORT QSoundEffect : public QObject
public: public:
enum Loop enum Loop
{ {
Infinite = -2, Infinite = -2
}; };
enum Status enum Status

2
src/plugins/gstreamer/qgstreamervideowindow.cpp
View File

@@ -313,7 +313,7 @@ QSize QGstreamerVideoWindow::nativeSize() const
return m_nativeSize; 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); QGstreamerVideoWindow *control = reinterpret_cast<QGstreamerVideoWindow*>(user_data);
QMetaObject::invokeMethod(control, "updateNativeVideoSize", Qt::QueuedConnection); QMetaObject::invokeMethod(control, "updateNativeVideoSize", Qt::QueuedConnection);

2
tests/auto/integration/qsound/qsound.pro
View File

@@ -1,6 +1,6 @@
TARGET = tst_qsound TARGET = tst_qsound
QT += core declarative multimedia-private testlib QT += core multimedia-private testlib
CONFIG += no_private_qt_headers_warning CONFIG += no_private_qt_headers_warning
# This is more of a system test # This is more of a system test

2
tests/auto/integration/qsoundeffect/qsoundeffect.pro
View File

@@ -1,6 +1,6 @@
TARGET = tst_qsoundeffect TARGET = tst_qsoundeffect
QT += core declarative multimedia-private testlib QT += core multimedia-private testlib
CONFIG += no_private_qt_headers_warning CONFIG += no_private_qt_headers_warning
# This is more of a system test # This is more of a system test