diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-12-05 13:58:30 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-05 14:44:19 +0100 |
| commit | a5d2b2ed60570fbf3d3fa2aefd20c78eeb0b8d0a (patch) | |
| tree | e7645daca6b57d61d92f2241cd2900da16745466 /src/imports | |
| parent | 3171081d43d6f83036807e3ad663d6918eb8e55c (diff) | |
QtMultimedia: Fix warnings about declarative/quick.
Change-Id: Ic9323b222641e41dae05cb4b0dccb6531e845676
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/multimedia.pro | 2 | ||||
| -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 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index d5b6ae53b..33269e326 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -3,7 +3,7 @@ TARGETPATH = QtMultimedia include(../qimportbase.pri) -QT += declarative network multimedia-private +QT += declarative quick network multimedia-private DESTDIR = $$QT.multimedia.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp index b7667fddc..e2813fe0e 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 <QtDeclarative/qquickitem.h> +#include <QtQuick/qquickitem.h> #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..24a57d6d4 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.h> #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 34a27fd9c..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 <QtDeclarative/qsgtexturematerial.h> -#include <QtDeclarative/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 45087dd0d..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 <QtDeclarative/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 71ca71994..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 <QtDeclarative/qsgtexturematerial.h> -#include <QtDeclarative/qsgmaterial.h> +#include <QtQuick/qsgtexturematerial.h> +#include <QtQuick/qsgmaterial.h> #include <QtCore/qmutex.h> #include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLFunctions> |