QtMultimedia: Fix warnings about declarative/quick.

Change-Id: Ic9323b222641e41dae05cb4b0dccb6531e845676 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-12-05 13:58:30 +01:00
parent 3171081d43
commit a5d2b2ed60
8 changed files with 10 additions and 10 deletions
--- a/examples/declarative-radio/declarative-radio.pro
+++ b/examples/declarative-radio/declarative-radio.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = declarative-radio
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative multimedia
+QT += declarative quick multimedia

 # Input
 SOURCES += main.cpp
--- a/examples/declarative-radio/main.cpp
+++ b/examples/declarative-radio/main.cpp
@@ -41,7 +41,7 @@
 #include <QGuiApplication>

 #include <qdeclarative.h>
-#include <qquickview.h>
+#include <QtQuick/qquickview.h>


 int main(int argc, char ** argv)
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>