diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2018-01-12 14:17:40 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2018-01-12 15:07:06 +0000 |
| commit | 417b32815d5d6c45a6c8b4d38b62ca10119d14fd (patch) | |
| tree | 5c910952affff3d376cbe84b7130be9ee7d6a577 /src/extras/defaults/qtexturematerial.h | |
| parent | 1d5f8b8536c1b0165c2292529dc3814e96bb0a27 (diff) | |
| parent | c9edc164ab165ddd31ef2411be19deb130614e8b (diff) | |
Merge branch '5.9' into 5.10
Conflicts:
.qmake.conf
src/animation/backend/handle_types_p.h
src/extras/defaults/qtexturematerial.h
src/render/backend/entity_p.h
src/render/backend/handle_types_p.h
src/render/backend/renderview.cpp
src/render/io/scenemanager.cpp
Change-Id: Ic145062cc98360e9067fd60f0992c7a6b51e41bb
Diffstat (limited to 'src/extras/defaults/qtexturematerial.h')
| -rw-r--r-- | src/extras/defaults/qtexturematerial.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |