diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-04 10:41:56 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-10-17 12:02:49 +0200 |
| commit | 77d812683f0ad595606f9833613dd49bb2fda26d (patch) | |
| tree | c1fb2f4a3e680db9c5597574fe8684571da0e0f5 /src/corelib/kernel | |
| parent | f76530a6171ca417865863b66e3ea439c27d057e (diff) | |
Refactor QMutexLocker to be able to handle recursive mutexes
Since we're going to split QMutex and QRecursiveMutex into
separate classes, make sure QMutexLocker is prepared for that.
Change-Id: Id5e9a955d1db7c8ee663dd3811ad6448dad0aeae
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qeventloop.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qjnihelpers.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp index 5a5dfb06aa..1938a65ca5 100644 --- a/src/corelib/kernel/qeventloop.cpp +++ b/src/corelib/kernel/qeventloop.cpp @@ -179,10 +179,10 @@ int QEventLoop::exec(ProcessEventsFlags flags) struct LoopReference { QEventLoopPrivate *d; - QMutexLocker &locker; + QMutexLocker<QMutex> &locker; bool exceptionCaught; - LoopReference(QEventLoopPrivate *d, QMutexLocker &locker) : d(d), locker(locker), exceptionCaught(true) + LoopReference(QEventLoopPrivate *d, QMutexLocker<QMutex> &locker) : d(d), locker(locker), exceptionCaught(true) { d->inExec = true; d->exit.storeRelease(false); diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp index 835db956ed..14f9f389e8 100644 --- a/src/corelib/kernel/qjnihelpers.cpp +++ b/src/corelib/kernel/qjnihelpers.cpp @@ -601,7 +601,7 @@ int QtAndroidPrivate::acuqireServiceSetup(int flags) void QtAndroidPrivate::setOnBindListener(QtAndroidPrivate::OnBindListener *listener) { - QMutexLocker lock(g_onBindListenerMutex); + QMutexLocker lock(g_onBindListenerMutex()); *g_onBindListener = listener; if (!g_serviceSetupLockers->deref()) g_waitForServiceSetupSemaphore->release(); @@ -609,7 +609,7 @@ void QtAndroidPrivate::setOnBindListener(QtAndroidPrivate::OnBindListener *liste jobject QtAndroidPrivate::callOnBindListener(jobject intent) { - QMutexLocker lock(g_onBindListenerMutex); + QMutexLocker lock(g_onBindListenerMutex()); if (*g_onBindListener) return (*g_onBindListener)->onBind(intent); return nullptr; |