diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-03-03 12:57:38 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-03-17 11:25:16 +0000 |
| commit | c01bc22c287e58186a285b3f8507711fd982fd05 (patch) | |
| tree | 77a5b100d5a02de3cf864672590cdde5d4099301 /src/render/defaults/qnormaldiffusespecularmapmaterial_p.h | |
| parent | a8371dccd60a097678239edc510e5bb4624b52b8 (diff) | |
QAnnotation changes
Task-number: QTBUG-51454
Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/defaults/qnormaldiffusespecularmapmaterial_p.h')
| -rw-r--r-- | src/render/defaults/qnormaldiffusespecularmapmaterial_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h index 79d6bbbc8..c13b491a0 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotation; +class QFilterKey; class QEffect; class QAbstractTextureProvider; class QTechnique; @@ -100,7 +100,7 @@ public: QRenderPass *m_normalDiffuseSpecularES2RenderPass; QShaderProgram *m_normalDiffuseSpecularGL3Shader; QShaderProgram *m_normalDiffuseSpecularGL2ES2Shader; - QAnnotation *m_annotation; + QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QNormalDiffuseSpecularMapMaterial) }; |