diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:30 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:30 +0100 |
| commit | 20f68cefe6d9a4c073721855053076cb63980a83 (patch) | |
| tree | 2cb6c15484594f99173612ca86dbcefc11a0375f /src/plugins/canbus | |
| parent | c8c0d240081b1f68fad0603c5658f9314acabe2e (diff) | |
| parent | 76cbf4b7d10db3aa8944c8480a6c504548f0e070 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Iddf3becef6ac9cd7978fcbe80457f85fbc80df52
Diffstat (limited to 'src/plugins/canbus')
| -rw-r--r-- | src/plugins/canbus/virtualcan/virtualcanbackend.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/canbus/virtualcan/virtualcanbackend.cpp b/src/plugins/canbus/virtualcan/virtualcanbackend.cpp index 2ba13ce..0057d9f 100644 --- a/src/plugins/canbus/virtualcan/virtualcanbackend.cpp +++ b/src/plugins/canbus/virtualcan/virtualcanbackend.cpp @@ -62,12 +62,12 @@ static const char LocalEchoFlag = 'L'; VirtualCanServer::VirtualCanServer(QObject *parent) : QObject(parent) { - qCDebug(QT_CANBUS_PLUGINS_VIRTUALCAN, "Server [%p]: constructed.", this); + qCDebug(QT_CANBUS_PLUGINS_VIRTUALCAN, "Server [%p] constructed.", this); } VirtualCanServer::~VirtualCanServer() { - qCDebug(QT_CANBUS_PLUGINS_VIRTUALCAN, "Server [%p]: destructed.", this); + qCDebug(QT_CANBUS_PLUGINS_VIRTUALCAN, "Server [%p] destructed.", this); } void VirtualCanServer::start(quint16 port) @@ -99,7 +99,7 @@ void VirtualCanServer::start(quint16 port) void VirtualCanServer::connected() { while (m_server->hasPendingConnections()) { - qCInfo(QT_CANBUS_PLUGINS_VIRTUALCAN, "Server [%p]: client connected.", this); + qCInfo(QT_CANBUS_PLUGINS_VIRTUALCAN, "Server [%p] client connected.", this); QTcpSocket *next = m_server->nextPendingConnection(); m_serverSockets.append(next); connect(next, &QIODevice::readyRead, this, &VirtualCanServer::readyRead); @@ -109,7 +109,7 @@ void VirtualCanServer::connected() void VirtualCanServer::disconnected() { - qCInfo(QT_CANBUS_PLUGINS_VIRTUALCAN, "Server [%p]: client disconnected.", this); + qCInfo(QT_CANBUS_PLUGINS_VIRTUALCAN, "Server [%p] client disconnected.", this); auto socket = qobject_cast<QTcpSocket *>(sender()); Q_ASSERT(socket); |