diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-06-19 10:37:25 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-06-19 10:37:25 +0100 |
| commit | 5af4e423be269a9edf3037ff0302d438f077de04 (patch) | |
| tree | a7e5eb78a718921141380658f00f1caedcdb1ba4 /src/render/renderstates/renderstates_p.h | |
| parent | 02e960493ef9a2f8dc25a06616fbde8fd869d1af (diff) | |
| parent | 01a6bcd086cecef3169e5d79bd72dbb0d1393a0f (diff) | |
Merge branch '5.9' into dev
Conflicts:
src/render/frontend/qcameralens_p.h
src/render/texture/qtexture.cpp
src/render/texture/qtexture_p.h
Change-Id: I20b25cf123f44c96f69ca5f8e042a38692e5cb49
Diffstat (limited to 'src/render/renderstates/renderstates_p.h')
| -rw-r--r-- | src/render/renderstates/renderstates_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/render/renderstates/renderstates_p.h b/src/render/renderstates/renderstates_p.h index cbd12a7b5..98701b335 100644 --- a/src/render/renderstates/renderstates_p.h +++ b/src/render/renderstates/renderstates_p.h @@ -134,11 +134,10 @@ public: void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; }; -class Q_AUTOTEST_EXPORT AlphaCoverage : public GenericState<AlphaCoverage, AlphaCoverageStateMask, GLboolean> +class Q_AUTOTEST_EXPORT AlphaCoverage : public GenericState<AlphaCoverage, AlphaCoverageStateMask> { public: void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; }; class Q_AUTOTEST_EXPORT PointSize : public GenericState<PointSize, PointSizeMask, bool, GLfloat> @@ -169,11 +168,10 @@ public: void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; }; -class Q_AUTOTEST_EXPORT SeamlessCubemap : public GenericState<SeamlessCubemap, SeamlessCubemapMask, GLboolean> +class Q_AUTOTEST_EXPORT SeamlessCubemap : public GenericState<SeamlessCubemap, SeamlessCubemapMask> { public: virtual void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; }; class Q_AUTOTEST_EXPORT StencilOp : public GenericState<StencilOp, StencilOpMask, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum> |