Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

1 files changed, 7 insertions, 7 deletions

diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp
index 983496230d..078274eabd 100644
--- a/src/gui/opengl/qopengltexture.cpp
+++ b/src/gui/opengl/qopengltexture.cpp
@@ -2668,12 +2668,12 @@ void QOpenGLTexture::generateMipMaps()
 }
 
 /*!
-    Generates mipmaps for this texture object from mipmap level \baseLevel. If you are
+    Generates mipmaps for this texture object from mipmap level \a baseLevel. If you are
     using a texture target and filtering option that requires mipmaps and you
     have disabled automatic mipmap generation then you need to call this function
     or the overload to create the mipmap chain.
 
-    The generation of mipmaps to above \baseLevel is achieved by setting the mipmap
+    The generation of mipmaps to above \a baseLevel is achieved by setting the mipmap
     base level to \a baseLevel and then generating the mipmap chain. If \a resetBaseLevel
     is \c true, then the baseLevel of the texture will be reset to its previous value.
 
@@ -3000,7 +3000,7 @@ void QOpenGLTexture::setBorderColor(QColor color)
 }
 
 /*!
-    Sets the color red to \a {r}, green to \a {g}, blue to \{b}, and \a {a} to the
+    Sets the color red to \a {r}, green to \a {g}, blue to \a {b}, and \a {a} to the
     alpha value.
     \overload
 */
@@ -3033,8 +3033,8 @@ void QOpenGLTexture::setBorderColor(float r, float g, float b, float a)
 }
 
 /*!
-    Sets the color red to \a {r}, green to \a {g}, blue to \a {b}, and \a the alpha
-    value to {a}.
+    Sets the color red to \a {r}, green to \a {g}, blue to \a {b}, and the alpha
+    value to \a {a}.
     \overload
 */
 void QOpenGLTexture::setBorderColor(int r, int g, int b, int a)
@@ -3068,8 +3068,8 @@ void QOpenGLTexture::setBorderColor(int r, int g, int b, int a)
 }
 
 /*!
-    Sets the color red to \a {r}, green to \a {g}, blue to \a {b}, and \a the alpha
-    value to {a}.
+    Sets the color red to \a {r}, green to \a {g}, blue to \a {b}, and the alpha
+    value to \a {a}.
     \overload
 */
 void QOpenGLTexture::setBorderColor(uint r, uint g, uint b, uint a)