diff options
| author | Josh Faust <jfaust@suitabletech.com> | 2013-02-20 11:42:56 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-25 11:50:50 +0100 |
| commit | ccba80ee3e7c13844a769e5cd2213f34842c674b (patch) | |
| tree | cc81ec8ff099834d7733e2754f73109d2d3f74a7 /src/quick | |
| parent | a496e0874858a4b7d991c179c0e12df46c3d324c (diff) | |
Fix headers without Qt module directory name in their includes
Fixed headers to include the Qt module directory in their #include
directives, e.g. <QtCore/QObject> instead of <QObject>.
QTBUG-29797
Change-Id: I6f61973deb4e48158d3eff896afd81ca4b8ae960
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsggeometry.h | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.h | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/util/qsgflatcolormaterial.h | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexture.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.h b/src/quick/scenegraph/coreapi/qsggeometry.h index c9b44e86b0..cfed30cb36 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.h +++ b/src/quick/scenegraph/coreapi/qsggeometry.h @@ -44,7 +44,7 @@ #include <QtQuick/qtquickglobal.h> #include <QtGui/qopengl.h> -#include <QRectF> +#include <QtCore/QRectF> QT_BEGIN_HEADER diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h index 062311e2e3..56109d32a0 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.h +++ b/src/quick/scenegraph/coreapi/qsgmaterial.h @@ -43,7 +43,7 @@ #define MATERIAL_H #include <QtQuick/qtquickglobal.h> -#include <qopenglshaderprogram.h> +#include <QtGui/qopenglshaderprogram.h> QT_BEGIN_HEADER diff --git a/src/quick/scenegraph/util/qsgflatcolormaterial.h b/src/quick/scenegraph/util/qsgflatcolormaterial.h index 97b8c14a9b..b24e5e7205 100644 --- a/src/quick/scenegraph/util/qsgflatcolormaterial.h +++ b/src/quick/scenegraph/util/qsgflatcolormaterial.h @@ -43,7 +43,7 @@ #define FLATCOLORMATERIAL_H #include <QtQuick/qsgmaterial.h> -#include <qcolor.h> +#include <QtGui/qcolor.h> QT_BEGIN_HEADER diff --git a/src/quick/scenegraph/util/qsgtexture.h b/src/quick/scenegraph/util/qsgtexture.h index 9d91d4e81c..4dcea63175 100644 --- a/src/quick/scenegraph/util/qsgtexture.h +++ b/src/quick/scenegraph/util/qsgtexture.h @@ -43,8 +43,8 @@ #define QSGTEXTURE_H #include <QtQuick/qtquickglobal.h> -#include <QObject> -#include <QImage> +#include <QtCore/QObject> +#include <QtGui/QImage> QT_BEGIN_HEADER |