summaryrefslogtreecommitdiffstats
path: root/src/gui/opengl
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-27 01:00:44 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-27 01:00:45 +0100
commitc6fc2bc3e205e3710d1f9bdca984c3309cc2eb06 (patch)
tree98dff745ee072895b1d3171ef439a9533689a517 /src/gui/opengl
parentac7f46dd9114051756f56571b9cb3bda002314a1 (diff)
parentbc107d81004a5f3929f30088f4a58a221bea5c3b (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Diffstat (limited to 'src/gui/opengl')
-rw-r--r--src/gui/opengl/qopenglframebufferobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp
index cae3d516c4..e7631b09ce 100644
--- a/src/gui/opengl/qopenglframebufferobject.cpp
+++ b/src/gui/opengl/qopenglframebufferobject.cpp
@@ -249,7 +249,7 @@ QOpenGLFramebufferObjectFormat::~QOpenGLFramebufferObjectFormat()
If the desired amount of samples per pixel is not supported by the hardware
then the maximum number of samples per pixel will be used. Note that
- multisample framebuffer objects can not be bound as textures. Also, the
+ multisample framebuffer objects cannot be bound as textures. Also, the
\c{GL_EXT_framebuffer_multisample} extension is required to create a
framebuffer with more than one sample per pixel.