summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qplatformgraphicsbufferhelper.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-11-16 08:10:15 +0100
committerLiang Qi <liang.qi@qt.io>2018-11-16 08:10:15 +0100
commit37d3bc9ad7731a131485a9be1ae5b5aac430f82e (patch)
tree2456b1d9bb5050bd5c871c62d0a2d362a1a003c7 /src/gui/kernel/qplatformgraphicsbufferhelper.cpp
parent1983abddc06350541ac7a4bb4b2da14091e96311 (diff)
parent900b57ea90ebe60414a5188337bc85ee4faac220 (diff)
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Diffstat (limited to 'src/gui/kernel/qplatformgraphicsbufferhelper.cpp')
-rw-r--r--src/gui/kernel/qplatformgraphicsbufferhelper.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformgraphicsbufferhelper.cpp b/src/gui/kernel/qplatformgraphicsbufferhelper.cpp
index 924266997d..c98aead5c2 100644
--- a/src/gui/kernel/qplatformgraphicsbufferhelper.cpp
+++ b/src/gui/kernel/qplatformgraphicsbufferhelper.cpp
@@ -57,6 +57,12 @@
QT_BEGIN_NAMESPACE
/*!
+ \namespace QPlatformGraphicsBufferHelper
+ \inmodule QtGui
+ \internal
+*/
+
+/*!
Convenience function to both lock and bind the \a graphicsBuffer to a texture.
This function will first try to lock with texture read and texture write
access. If this succeeds it will use the bindToTexture function to bind the