diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2018-01-17 11:49:32 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2018-01-17 11:49:32 +0000 |
| commit | b420edb0b5e914b83c35a071b371d0759eba4d3d (patch) | |
| tree | e84852a8c44a18fe6aeadf29cba5dcdefe8e9e58 /src/extras/defaults | |
| parent | 24b2599b91c51ae4b7f2c161cf46696bbde67624 (diff) | |
| parent | e9594f27ccad5667ebc27451f87184296c5cd297 (diff) | |
Merge branch '5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I248aa369ba98659a61e563fd29cc811c76ea1e2d
Diffstat (limited to 'src/extras/defaults')
| -rw-r--r-- | src/extras/defaults/qabstractspritesheet.h | 4 | ||||
| -rw-r--r-- | src/extras/defaults/qmorphphongmaterial.h | 2 | ||||
| -rw-r--r-- | src/extras/defaults/qspritegrid.h | 4 | ||||
| -rw-r--r-- | src/extras/defaults/qspritesheet.h | 4 | ||||
| -rw-r--r-- | src/extras/defaults/qtexturematerial.h | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/extras/defaults/qabstractspritesheet.h b/src/extras/defaults/qabstractspritesheet.h index cb8b70fd9..bbef65798 100644 --- a/src/extras/defaults/qabstractspritesheet.h +++ b/src/extras/defaults/qabstractspritesheet.h @@ -42,8 +42,8 @@ #include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DCore/QNode> -#include <QVector2D> -#include <QMatrix3x3> +#include <QtGui/QVector2D> +#include <QtGui/QMatrix3x3> QT_BEGIN_NAMESPACE diff --git a/src/extras/defaults/qmorphphongmaterial.h b/src/extras/defaults/qmorphphongmaterial.h index 3b65088b1..235426f1c 100644 --- a/src/extras/defaults/qmorphphongmaterial.h +++ b/src/extras/defaults/qmorphphongmaterial.h @@ -39,7 +39,7 @@ #include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qmaterial.h> -#include <QColor> +#include <QtGui/QColor> QT_BEGIN_NAMESPACE diff --git a/src/extras/defaults/qspritegrid.h b/src/extras/defaults/qspritegrid.h index 3b6a7005a..a0e73abdf 100644 --- a/src/extras/defaults/qspritegrid.h +++ b/src/extras/defaults/qspritegrid.h @@ -42,8 +42,8 @@ #include <Qt3DExtras/qabstractspritesheet.h> #include <Qt3DCore/qcomponent.h> -#include <QVector2D> -#include <QMatrix3x3> +#include <QtGui/QVector2D> +#include <QtGui/QMatrix3x3> QT_BEGIN_NAMESPACE diff --git a/src/extras/defaults/qspritesheet.h b/src/extras/defaults/qspritesheet.h index 00fd293c3..0e78c0e22 100644 --- a/src/extras/defaults/qspritesheet.h +++ b/src/extras/defaults/qspritesheet.h @@ -41,8 +41,8 @@ #define QT3DEXTRAS_QSPRITESHEET_H #include <Qt3DExtras/qabstractspritesheet.h> -#include <QRect> -#include <QVector> +#include <QtCore/QRect> +#include <QtCore/QVector> QT_BEGIN_NAMESPACE diff --git a/src/extras/defaults/qtexturematerial.h b/src/extras/defaults/qtexturematerial.h index b6347aff4..c4fb43f50 100644 --- a/src/extras/defaults/qtexturematerial.h +++ b/src/extras/defaults/qtexturematerial.h @@ -42,8 +42,8 @@ #include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qmaterial.h> -#include <QVector2D> -#include <QMatrix3x3> +#include <QtGui/QVector2D> +#include <QtGui/QMatrix3x3> QT_BEGIN_NAMESPACE |