diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-13 22:56:02 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-13 22:56:03 +0100 |
| commit | 9c055e8e47d9411a8f34abe6872e4bfd942cc372 (patch) | |
| tree | 895e139477c88a064a993f035afec614de9dafc7 /src/corelib/kernel/qobject.cpp | |
| parent | d08e0e861acadf3a354d3833dd5623ef71fa7a4b (diff) | |
| parent | 76010f4af8c9a59a20c489d70c7f99b802f9721f (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iaec2e57d6bf33355ddfa61d25133580a8740335f
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 5b37945ae05..263c4019f7a 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -516,7 +516,7 @@ void QMetaCallEvent::placeMetaCall(QObject *object) \reentrant - QSignalBlocker can be used whereever you would otherwise use a + QSignalBlocker can be used wherever you would otherwise use a pair of calls to blockSignals(). It blocks signals in its constructor and in the destructor it resets the state to what it was before the constructor ran. |