diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-12-09 15:43:18 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-09 07:06:19 +0100 |
| commit | 9d526fca670ba90c8ad433f60bd94f9b9975e18d (patch) | |
| tree | 00b19da37d59b326114e6f9fe0907fccf70be308 /src/imports | |
| parent | 47ef58967bb3821b36e9d635938646f30e667d26 (diff) | |
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>
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 e2813fe0e..722e3077b 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 24a57d6d4..6b990f72f 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 d414b79e3..2faa89550 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 595623fa6..67a4c0d5f 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 94206762b..5f0fe821c 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> |