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/render/renderstates | |
| 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/render/renderstates')
| -rw-r--r-- | src/render/renderstates/qstenciloperationarguments.h | 2 | ||||
| -rw-r--r-- | src/render/renderstates/qstenciltestarguments.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/render/renderstates/qstenciloperationarguments.h b/src/render/renderstates/qstenciloperationarguments.h index db80ecc19..9705c9822 100644 --- a/src/render/renderstates/qstenciloperationarguments.h +++ b/src/render/renderstates/qstenciloperationarguments.h @@ -40,7 +40,7 @@ #ifndef QT3DRENDER_QSTENCILOPERATIONARGUMENTS_H #define QT3DRENDER_QSTENCILOPERATIONARGUMENTS_H -#include <QObject> +#include <QtCore/QObject> #include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qstenciltestarguments.h b/src/render/renderstates/qstenciltestarguments.h index f20885d03..35447d477 100644 --- a/src/render/renderstates/qstenciltestarguments.h +++ b/src/render/renderstates/qstenciltestarguments.h @@ -40,7 +40,7 @@ #ifndef QT3DRENDER_QSTENCILTESTARGUMENTS_H #define QT3DRENDER_QSTENCILTESTARGUMENTS_H -#include <QObject> +#include <QtCore/QObject> #include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE |