summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qplatformgraphicsbuffer.cpp
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/kernel/qplatformgraphicsbuffer.cpp
parentac7f46dd9114051756f56571b9cb3bda002314a1 (diff)
parentbc107d81004a5f3929f30088f4a58a221bea5c3b (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Diffstat (limited to 'src/gui/kernel/qplatformgraphicsbuffer.cpp')
-rw-r--r--src/gui/kernel/qplatformgraphicsbuffer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qplatformgraphicsbuffer.cpp b/src/gui/kernel/qplatformgraphicsbuffer.cpp
index d361a8fc120..73ec033e195 100644
--- a/src/gui/kernel/qplatformgraphicsbuffer.cpp
+++ b/src/gui/kernel/qplatformgraphicsbuffer.cpp
@@ -184,7 +184,7 @@ void QPlatformGraphicsBuffer::unlock()
\fn QPlatformGraphicsBuffer::doLock(AccessTypes access, const QRect &rect = QRect())
This function should be reimplemented by subclasses. If one of the \a
- access types specified can not be locked, then all should fail and this
+ access types specified cannot be locked, then all should fail and this
function should return false.
\a rect is the subrect which is desired to be locked. This