diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 01:01:29 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 01:01:30 +0100 |
commit | 11b9c813e6705b0349e4c241f9132a6649977431 (patch) | |
tree | 69df65cb06c9617ab305a55be413a6be63677913 /src/corelib/tools | |
parent | 8cc8eb8f24b9d297a25c9841326c6fa8561cf80e (diff) | |
parent | 4554fa7b191566df0a6c07e686c642c78eb88095 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ief0a0b754c104d5348fee9ee15e967bd37c526f8
Diffstat (limited to 'src/corelib/tools')
-rw-r--r-- | src/corelib/tools/qscopeguard.qdoc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/tools/qscopeguard.qdoc b/src/corelib/tools/qscopeguard.qdoc index 21b0bab9cf..5a9b7fd210 100644 --- a/src/corelib/tools/qscopeguard.qdoc +++ b/src/corelib/tools/qscopeguard.qdoc @@ -37,6 +37,12 @@ QT_BEGIN_NAMESPACE a scope. */ +/*! \fn template <typename F> void QScopeGuard<F>::dismiss() + + Disarms the scope guard, so that the function \e F will not be called at + the end of the scope. +*/ + /*! \fn template <typename F> const QScopeGuard<F> qScopeGuard(F f) \inmodule QtCore |