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>
This commit is contained in:
committed by
Qt by Nokia
parent
47ef58967b
commit
9d526fca67
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user