diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:11:54 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:11:54 +0200 |
| commit | c4fc062f5b9d28a61061f17a266aa025f8208c68 (patch) | |
| tree | b744cc40d06d764a8a6b05fc4adbc103c4833ac5 /tests | |
| parent | f59374f875395e367ed4d6f298e50931bfc74d91 (diff) | |
| parent | da0d7d591c9406e436e69def16f74c649956bca0 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I1e024cf6987c7f869b991dbcc14591fb4d382340
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qmodbusclient/tst_qmodbusclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qmodbusclient/tst_qmodbusclient.cpp b/tests/auto/qmodbusclient/tst_qmodbusclient.cpp index a6fd8ed..5e4a729 100644 --- a/tests/auto/qmodbusclient/tst_qmodbusclient.cpp +++ b/tests/auto/qmodbusclient/tst_qmodbusclient.cpp @@ -67,7 +67,7 @@ public: d_func()->m_open = true; setState(QModbusDevice::UnconnectedState); } - bool processResponse(const QModbusResponse &response, QModbusDataUnit *data) + bool processResponse(const QModbusResponse &response, QModbusDataUnit *data) override { return QModbusClient::processResponse(response, data); } |