diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-04-24 10:14:04 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-04-24 10:14:04 +0300 |
commit | b3081c36baee48b43b6285b4811dc6da451e2390 (patch) | |
tree | 75d0f7a4b7d2cb631162e4b2f8469a3788a264af | |
parent | f8684ae6b0c12b6b21f1547fabe38b60c39f8893 (diff) | |
parent | 554368b40d8e7eb3ad80d2d6980a3735bb1aa5a1 (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into tqtc/lts-5.15-opensourcev5.15.10-lts-lgpl
Change-Id: Ifc7456c6db2585c8c3631dfd17f0ef96f76d8e16
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | src/serialbus/qcanbusdeviceinfo.h | 2 | ||||
-rw-r--r-- | src/serialbus/qmodbusclient.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index 9a04d64..c0e0d61 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.9 +MODULE_VERSION = 5.15.10 diff --git a/src/serialbus/qcanbusdeviceinfo.h b/src/serialbus/qcanbusdeviceinfo.h index c46302d..ee8d7ae 100644 --- a/src/serialbus/qcanbusdeviceinfo.h +++ b/src/serialbus/qcanbusdeviceinfo.h @@ -54,7 +54,7 @@ public: void swap(QCanBusDeviceInfo &other) Q_DECL_NOTHROW { - qSwap(d_ptr, other.d_ptr); + d_ptr.swap(other.d_ptr); } QCanBusDeviceInfo &operator=(const QCanBusDeviceInfo &other); diff --git a/src/serialbus/qmodbusclient.cpp b/src/serialbus/qmodbusclient.cpp index 1c8fd80..0801475 100644 --- a/src/serialbus/qmodbusclient.cpp +++ b/src/serialbus/qmodbusclient.cpp @@ -367,7 +367,7 @@ void QModbusClientPrivate::processQueueElement(const QModbusResponse &pdu, } QModbusDataUnit unit = element.unit; - if (!processResponse(pdu, &unit)) { + if (!q_func()->processResponse(pdu, &unit)) { element.reply->setError(QModbusDevice::UnknownError, QModbusClient::tr("An invalid response has been received.")); return; |