diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:16:29 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:23:19 +0200 |
| commit | f4b4c4f79b629498f3cddbbc10df8c1b4d6020d9 (patch) | |
| tree | 4119707660438ff58bd51f9cbe0f9e2a33f4b806 /src/corelib/kernel/qcoreapplication_win.cpp | |
| parent | 9bd6cec74dbbc5aece55dc0c8808494db29b9963 (diff) | |
| parent | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
Diffstat (limited to 'src/corelib/kernel/qcoreapplication_win.cpp')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_win.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp index 3f22c309ff..37c43dee4f 100644 --- a/src/corelib/kernel/qcoreapplication_win.cpp +++ b/src/corelib/kernel/qcoreapplication_win.cpp @@ -47,6 +47,7 @@ #ifndef QT_NO_QOBJECT #include "qmutex.h" #include <private/qthread_p.h> +#include <private/qlocking_p.h> #endif #include "qtextstream.h" #include <ctype.h> @@ -919,7 +920,7 @@ void QCoreApplicationPrivate::removePostedTimerEvent(QObject *object, int timerI { QThreadData *data = object->d_func()->threadData; - QMutexLocker locker(&data->postEventList.mutex); + const auto locker = qt_scoped_lock(data->postEventList.mutex); if (data->postEventList.size() == 0) return; for (int i = 0; i < data->postEventList.size(); ++i) { |