diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-11-25 09:47:43 +0100 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2014-11-27 04:16:22 +0100 |
| commit | b9d98c10bdc3c8e6330e84cca48ea302e8cd61c3 (patch) | |
| tree | 633ea35cfbb41cc0ab65cf31954c74d3c5225d56 /src/gui/opengl/qopengltexture.cpp | |
| parent | b55f88caba339a49bf0ebabfa324dde523c2b866 (diff) | |
Deprecate implementations of functions deprecated in headers
If you build with configure -DQT_NO_DEPRECATED this will avoid some
build errors.
Change-Id: If2b2e57b6919091f3f077ebc2aeca0c3fd2421aa
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/gui/opengl/qopengltexture.cpp')
| -rw-r--r-- | src/gui/opengl/qopengltexture.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp index f6083b8cf9..b96bc6f346 100644 --- a/src/gui/opengl/qopengltexture.cpp +++ b/src/gui/opengl/qopengltexture.cpp @@ -2591,6 +2591,7 @@ void QOpenGLTexture::setData(PixelFormat sourceFormat, PixelType sourceType, d->setData(0, 0, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options); } +#if QT_DEPRECATED_SINCE(5, 3) /*! \obsolete \overload @@ -2648,6 +2649,7 @@ void QOpenGLTexture::setData(PixelFormat sourceFormat, PixelType sourceType, Q_ASSERT(d->textureId); d->setData(0, 0, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options); } +#endif /*! This overload of setData() will allocate storage for you. @@ -2736,6 +2738,7 @@ void QOpenGLTexture::setCompressedData(int dataSize, const void *data, d->setCompressedData(0, 0, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options); } +#if QT_DEPRECATED_SINCE(5, 3) /*! \obsolete \overload @@ -2789,6 +2792,7 @@ void QOpenGLTexture::setCompressedData(int dataSize, void *data, Q_ASSERT(d->textureId); d->setCompressedData(0, 0, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options); } +#endif /*! Returns \c true if your OpenGL implementation and version supports the texture |