From 9d526fca670ba90c8ad433f60bd94f9b9975e18d Mon Sep 17 00:00:00 2001
From: Michael Goddard <michael.goddard@nokia.com>
Date: Fri, 9 Dec 2011 15:43:18 +1000
Subject: [PATCH] Remove the module prefix from a number of includes.

Since I get build failures due to other changes in lower modules.

Change-Id: Iac6a814071c019de25db52daf941185337fad14a
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
---
 src/imports/multimedia/qdeclarativevideooutput.cpp | 2 +-
 src/imports/multimedia/qdeclarativevideooutput_p.h | 2 +-
 src/imports/multimedia/qsgvideonode_i420.cpp       | 4 ++--
 src/imports/multimedia/qsgvideonode_p.h            | 2 +-
 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 e2813fe0..722e3077 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 <QtQuick/qquickitem.h>
+#include <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 24a57d6d..6b990f72 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 <QtQuick/qquickitem.h>
+#include <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 d414b79e..2faa8955 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 <QtQuick/qsgtexturematerial.h>
-#include <QtQuick/qsgmaterial.h>
+#include <qsgtexturematerial.h>
+#include <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 595623fa..67a4c0d5 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 <QtQuick/qsgnode.h>
+#include <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 94206762..5f0fe821 100644
--- a/src/imports/multimedia/qsgvideonode_rgb.cpp
+++ b/src/imports/multimedia/qsgvideonode_rgb.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include "qsgvideonode_rgb.h"
-#include <QtQuick/qsgtexturematerial.h>
-#include <QtQuick/qsgmaterial.h>
+#include <qsgtexturematerial.h>
+#include <qsgmaterial.h>
 #include <QtCore/qmutex.h>
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLFunctions>