diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-09-12 18:30:07 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-09-12 18:30:07 +0300 |
| commit | 180cb13048a24510f9a1b20796772d27da762bdd (patch) | |
| tree | e8667d86f6922dcad4a9e529e770b6fac2640ac6 | |
| parent | f9f7eee60adac72fcf6617d164e3bf61222bb5c5 (diff) | |
| parent | c7fad2e9cc12f941c0b6d9f78f471942bbc6c30c (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into tqtc/lts-5.15-opensourcev5.15.7-lts-lgpl
Change-Id: I394e9f92f78e76a3dfe5b7cb92ab94eba150ba0b
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/serialbus/qcanbusdevice.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 4665994..ecacf6e 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.6 +MODULE_VERSION = 5.15.7 diff --git a/src/serialbus/qcanbusdevice.cpp b/src/serialbus/qcanbusdevice.cpp index 5b6c343..7cf0c7e 100644 --- a/src/serialbus/qcanbusdevice.cpp +++ b/src/serialbus/qcanbusdevice.cpp @@ -606,7 +606,7 @@ void QCanBusDevice::clear(QCanBusDevice::Directions direction) clearError(); if (direction & Direction::Input) { - QMutexLocker(&d->incomingFramesGuard); + QMutexLocker locker(&d->incomingFramesGuard); d->incomingFrames.clear(); } |