diff options
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qfuture_impl.h | 4 | ||||
| -rw-r--r-- | src/corelib/thread/qfutureinterface.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/thread/qreadwritelock_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/thread/qsemaphore.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/thread/qfuture_impl.h b/src/corelib/thread/qfuture_impl.h index 3435ea382bb..8e96b943ef9 100644 --- a/src/corelib/thread/qfuture_impl.h +++ b/src/corelib/thread/qfuture_impl.h @@ -423,7 +423,7 @@ void Continuation<Function, ResultType, ParentResultType>::runFunction() fulfillPromiseWithResult(); } else { // This assert normally should never fail, this is to make sure - // that nothing unexpected happend. + // that nothing unexpected happened. static_assert(std::is_invocable_v<Function, QFuture<ParentResultType>>, "The continuation is not invocable with the provided arguments"); fulfillPromise(parentFuture); @@ -438,7 +438,7 @@ void Continuation<Function, ResultType, ParentResultType>::runFunction() fulfillVoidPromise(); } else { // This assert normally should never fail, this is to make sure - // that nothing unexpected happend. + // that nothing unexpected happened. static_assert(std::is_invocable_v<Function, QFuture<ParentResultType>>, "The continuation is not invocable with the provided arguments"); function(parentFuture); diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp index 9f70c3e5353..8cdc10a94b6 100644 --- a/src/corelib/thread/qfutureinterface.cpp +++ b/src/corelib/thread/qfutureinterface.cpp @@ -860,7 +860,7 @@ bool QFutureInterfaceBase::isChainCanceled() const while (parent) { // If the future is in Canceled state because it had an exception, we want to // continue checking the chain of parents for cancellation, otherwise if the exception - // is handeled inside the chain, it won't be interrupted even though cancellation has + // is handled inside the chain, it won't be interrupted even though cancellation has // been requested. if ((parent->state.loadRelaxed() & Canceled) && !parent->hasException) return true; diff --git a/src/corelib/thread/qreadwritelock_p.h b/src/corelib/thread/qreadwritelock_p.h index b0f4e1e5f5d..e1d42fbbf30 100644 --- a/src/corelib/thread/qreadwritelock_p.h +++ b/src/corelib/thread/qreadwritelock_p.h @@ -49,7 +49,7 @@ public: void release(); static QReadWriteLockPrivate *allocate(); - // Recusive mutex handling + // Recursive mutex handling Qt::HANDLE currentWriter = {}; struct Reader { diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp index 190f56a10e2..664085eb2b9 100644 --- a/src/corelib/thread/qsemaphore.cpp +++ b/src/corelib/thread/qsemaphore.cpp @@ -484,7 +484,7 @@ bool QSemaphore::tryAcquire(int n, int timeout) It is equivalent to calling \c{tryAcquire(1, timeout)}, where the call times out on the given \a timeout value. The function returns \c true - on accquiring the resource successfully. + on acquiring the resource successfully. \sa tryAcquire(), try_acquire(), try_acquire_until() */ |