diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-02 09:40:37 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-10-03 21:18:49 +0200 |
| commit | 3f20529e605eac75f416931c5c96ea03efa0c3ce (patch) | |
| tree | 1db3865f104a9a61ab5eeb71b5fc77868adbe07b /src/render/frontend/qshaderprogram.h | |
| parent | 7b26f6a1746419161a8f875e341b3e31220f4141 (diff) | |
QAbstract removed from core
Task-number: QTBUG-41530
Change-Id: I32ed3d9b819e4e9eafdd36adc30bed9156284777
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qshaderprogram.h')
| -rw-r--r-- | src/render/frontend/qshaderprogram.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/render/frontend/qshaderprogram.h b/src/render/frontend/qshaderprogram.h index 7c70f2fb1..6e3b0deeb 100644 --- a/src/render/frontend/qshaderprogram.h +++ b/src/render/frontend/qshaderprogram.h @@ -43,7 +43,7 @@ #define QT3D_QSHADERPROGRAM_H #include <QUuid> -#include <Qt3DCore/qabstractshader.h> +#include <Qt3DCore/qnode.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE @@ -52,7 +52,7 @@ namespace Qt3D { class QShaderProgramPrivate; -class QT3DRENDERERSHARED_EXPORT QShaderProgram : public QAbstractShader +class QT3DRENDERERSHARED_EXPORT QShaderProgram : public QNode { Q_OBJECT @@ -153,4 +153,6 @@ private: QT_END_NAMESPACE +Q_DECLARE_METATYPE(Qt3D::QShaderProgram *) + #endif // QT3D_QSHADERPROGRAM_H |