diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2021-03-01 12:56:15 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-15 12:14:40 +0000 |
| commit | 49c58510549370d22a1c0f9c9243bdff5c023d80 (patch) | |
| tree | ec474d62b77d918139caf4080ba4a239a433b53c /src/opengl | |
| parent | 3858d1e913ef3c9c1e970fff9d0bc0e639982e78 (diff) | |
QOpenGLTexture: Fix typo in enum value
Fixes: QTBUG-91431
Change-Id: I59c37de527f53339130216997402f325d0badb12
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 2cfbce4bc61fd1f450f221e6ce733753f6cabb0b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qopengltexture.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qopengltexture.h | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/opengl/qopengltexture.cpp b/src/opengl/qopengltexture.cpp index cdf2494505..8e8f57d0fc 100644 --- a/src/opengl/qopengltexture.cpp +++ b/src/opengl/qopengltexture.cpp @@ -4258,7 +4258,7 @@ QOpenGLTexture::DepthStencilMode QOpenGLTexture::depthStencilMode() const \value CompareLess Equivalent to GL_LESS. \value CompareGreater Equivalent to GL_GREATER. \value CompareEqual Equivalent to GL_EQUAL. - \value CommpareNotEqual Equivalent to GL_NOTEQUAL. + \value CompareNotEqual Equivalent to GL_NOTEQUAL. \value CompareAlways Equivalent to GL_ALWAYS. \value CompareNever Equivalent to GL_NEVER. diff --git a/src/opengl/qopengltexture.h b/src/opengl/qopengltexture.h index 28bd5a07cc..c56f832035 100644 --- a/src/opengl/qopengltexture.h +++ b/src/opengl/qopengltexture.h @@ -550,9 +550,14 @@ public: CompareLess = 0x0201, // GL_LESS CompareGreater = 0x0204, // GL_GREATER CompareEqual = 0x0202, // GL_EQUAL - CommpareNotEqual = 0x0205, // GL_NOTEQUAL + CompareNotEqual = 0x0205, // GL_NOTEQUAL CompareAlways = 0x0207, // GL_ALWAYS - CompareNever = 0x0200 // GL_NEVER + CompareNever = 0x0200, // GL_NEVER + +#if QT_DEPRECATED_SINCE(6, 1) + CommpareNotEqual Q_DECL_ENUMERATOR_DEPRECATED_X( + "Use CompareNotEqual instead.") = CompareNotEqual +#endif }; Q_ENUM(ComparisonFunction) |