diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/canbus/virtualcan/virtualcanbackend.cpp | 6 | ||||
| -rw-r--r-- | src/serialbus/CMakeLists.txt | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/canbus/virtualcan/virtualcanbackend.cpp b/src/plugins/canbus/virtualcan/virtualcanbackend.cpp index c901669..0a56657 100644 --- a/src/plugins/canbus/virtualcan/virtualcanbackend.cpp +++ b/src/plugins/canbus/virtualcan/virtualcanbackend.cpp @@ -5,6 +5,7 @@ #include <QtCore/qdatetime.h> #include <QtCore/qloggingcategory.h> +#include <QtCore/qmutex.h> #include <QtCore/qregularexpression.h> #include <QtNetwork/qtcpserver.h> @@ -133,6 +134,7 @@ void VirtualCanServer::readyRead() } Q_GLOBAL_STATIC(VirtualCanServer, g_server) +static QBasicMutex g_serverMutex; VirtualCanBackend::VirtualCanBackend(const QString &interface, QObject *parent) : QCanBusDevice(parent) @@ -174,8 +176,10 @@ bool VirtualCanBackend::open() const QHostAddress address = host.isEmpty() ? QHostAddress::LocalHost : QHostAddress(host); const quint16 port = static_cast<quint16>(m_url.port(ServerDefaultTcpPort)); - if (address.isLoopback()) + if (address.isLoopback()) { + const QMutexLocker locker(&g_serverMutex); g_server->start(port); + } m_clientSocket = new QTcpSocket(this); m_clientSocket->connectToHost(address, port, QIODevice::ReadWrite); diff --git a/src/serialbus/CMakeLists.txt b/src/serialbus/CMakeLists.txt index 015e479..026f3c5 100644 --- a/src/serialbus/CMakeLists.txt +++ b/src/serialbus/CMakeLists.txt @@ -40,7 +40,6 @@ qt_internal_add_module(SerialBus PRIVATE_MODULE_INTERFACE Qt::CorePrivate Qt::Network - GENERATE_CPP_EXPORTS ) ## Scopes: |