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/multimedia/qsgvideonode_i420.cpp | |
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/multimedia/qsgvideonode_i420.cpp')
-rw-r--r-- | src/imports/multimedia/qsgvideonode_i420.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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> |