AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc: Fix copy-paste error in QOpenGLTexture::Target docs

Browse Source 
Add a link to https://www.khronos.org/opengl/wiki/Array_Texture.

Fixes: QTBUG-49802
Change-Id: Ic740dd758c41a8f3e471a503bd2d02f6d3096f50
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This commit is contained in:
Leena Miettinen 2020-01-24 12:27:58 +01:00
parent 54b1f1d199
commit 382619de65
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/global/externalsites/external-resources.qdoc
View File

@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@ -482,6 +482,11 @@
\title Khronos OpenGL ES API Registry
*/
/*!
\externalpage https://www.khronos.org/opengl/wiki/Array_Texture
\title Array Texture
*/
/*!
\externalpage https://github.com/iksaif/qsslkey-p11
\title qsslkey example

4
src/gui/opengl/qopengltexture.cpp
View File

@ -1,6 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
@ -2126,6 +2127,7 @@ QOpenGLTexture *QOpenGLTexturePrivate::createTextureView(QOpenGLTexture::Target
/*!
\enum QOpenGLTexture::Target
This enum defines the texture target of a QOpenGLTexture object.
For more information on creating array textures, see \l{Array Texture}.
\value Target1D A 1-dimensional texture.
Equivalent to GL_TEXTURE_1D.
@ -2133,7 +2135,7 @@ QOpenGLTexture *QOpenGLTexturePrivate::createTextureView(QOpenGLTexture::Target
Equivalent to GL_TEXTURE_1D_ARRAY
\value Target2D A 2-dimensional texture.
Equivalent to GL_TEXTURE_2D
\value Target2DArray An array of 1-dimensional textures.
\value Target2DArray An array of 2-dimensional textures.
Equivalent to GL_TEXTURE_2D_ARRAY
\value Target3D A 3-dimensional texture.
Equivalent to GL_TEXTURE_3D