summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qobject.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/corelib/kernel/qobject.cpp
parentac7f46dd9114051756f56571b9cb3bda002314a1 (diff)
parentbc107d81004a5f3929f30088f4a58a221bea5c3b (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
-rw-r--r--src/corelib/kernel/qobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 7b9689f1cf..1382015d76 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2106,7 +2106,7 @@ void QObject::removeEventFilter(QObject *obj)
This signal is emitted immediately before the object \a obj is
destroyed, after any instances of QPointer have been notified,
- and can not be blocked.
+ and cannot be blocked.
All the objects's children are destroyed immediately after this
signal is emitted.