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/render/renderstates | |
| parent | 24b2599b91c51ae4b7f2c161cf46696bbde67624 (diff) | |
| parent | e9594f27ccad5667ebc27451f87184296c5cd297 (diff) | |
Merge branch '5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I248aa369ba98659a61e563fd29cc811c76ea1e2d
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 |