diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-05 08:17:54 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-05 08:18:37 +0100 |
| commit | 3910efbda60d125ca22fb70afe83c224d742d483 (patch) | |
| tree | 63d9c76d5c10f8d1359bbad5f6379597803a2af3 /src/imports | |
| parent | 55c0505a001a8ebde961dc5e4f16806efd72bb4e (diff) | |
QtMultimedia: Fix compiler warnings.
- 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>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativevideooutput.cpp | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativevideooutput_p.h | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qsgvideonode_i420.cpp | 4 | ||||
| -rw-r--r-- | src/imports/multimedia/qsgvideonode_p.h | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qsgvideonode_rgb.cpp | 4 |
5 files changed, 7 insertions, 7 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> |