diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2020-06-10 11:54:44 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2020-06-10 14:01:33 +0200 |
| commit | ef9372904e7e1e2e42a99e189589236106b78d54 (patch) | |
| tree | dd1bc9292fde7d72db3c899ddeeca9d584dd7d5a | |
| parent | 5958aa3e8cdccbb6122a3f8ef34ca2261496d080 (diff) | |
Update dependencies and fix related issues
Change-Id: I7a84d3acea165128c0a9dcb4dec1929d5fe5aeab
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| -rw-r--r-- | dependencies.yaml | 4 | ||||
| -rw-r--r-- | examples/serialbus/modbus/adueditor/plaintextedit.h | 5 | ||||
| -rw-r--r-- | src/serialbus/qmodbuspdu.cpp | 2 | ||||
| -rw-r--r-- | src/serialbus/qmodbustcpclient_p.h | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 42d73b6..06ed447 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 089d54f06ff327f5212cb08fdbcb540066357dd5 + ref: 4c5f6eb74cfb3282513c0837c80a08705c1da844 required: true ../qtserialport: - ref: 0dd2e497e12d16946395a6aeb81a4d69e1e2b638 + ref: 543e41db0f13f552c5bb36e58b39045b70f369b5 required: false diff --git a/examples/serialbus/modbus/adueditor/plaintextedit.h b/examples/serialbus/modbus/adueditor/plaintextedit.h index cbc590c..f5505fe 100644 --- a/examples/serialbus/modbus/adueditor/plaintextedit.h +++ b/examples/serialbus/modbus/adueditor/plaintextedit.h @@ -59,6 +59,11 @@ class PlainTextEdit : public QPlainTextEdit Q_OBJECT Q_DISABLE_COPY(PlainTextEdit) +public Q_SLOT: + void setFocus() { + QWidget::setFocus(); + } + public: explicit PlainTextEdit(QWidget *parent = nullptr) : QPlainTextEdit(parent) diff --git a/src/serialbus/qmodbuspdu.cpp b/src/serialbus/qmodbuspdu.cpp index 9ca9027..1f13a0e 100644 --- a/src/serialbus/qmodbuspdu.cpp +++ b/src/serialbus/qmodbuspdu.cpp @@ -439,7 +439,7 @@ static QDataStream &pduFromStream(QDataStream &stream, QModbusPdu &pdu, Type typ QDebug operator<<(QDebug debug, const QModbusPdu &pdu) { QDebugStateSaver _(debug); - debug.nospace().noquote() << "0x" << Qt::hex << qSetFieldWidth(2) << qSetPadChar('0') + debug.nospace().noquote() << "0x" << Qt::hex << qSetFieldWidth(2) << qSetPadChar(u'0') << (pdu.isException() ? pdu.functionCode() | QModbusPdu::ExceptionByte : pdu.functionCode()) << qSetFieldWidth(0) << pdu.data().toHex(); return debug; diff --git a/src/serialbus/qmodbustcpclient_p.h b/src/serialbus/qmodbustcpclient_p.h index 649b48e..cdac792 100644 --- a/src/serialbus/qmodbustcpclient_p.h +++ b/src/serialbus/qmodbustcpclient_p.h @@ -86,8 +86,7 @@ public: cleanupTransactionStore(); }); - QObject::connect(m_socket, - QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error), q, + QObject::connect(m_socket, &QAbstractSocket::errorOccurred, q, [this](QAbstractSocket::SocketError /*error*/) { Q_Q(QModbusTcpClient); |