diff options
author | Lorenz Haas <lorenz.haas@histomatics.de> | 2017-12-21 20:02:31 +0100 |
---|---|---|
committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2018-02-02 07:59:30 +0000 |
commit | 2c3c2a41c55a179332ec2a076856990f36dd5ef9 (patch) | |
tree | 8fe78f8a46e64a31f5966081269359a826f13828 | |
parent | 91df4c8ef853e7de9ce7ebcb617fa777f6e6a679 (diff) |
Keep m_transportType consistent5.10
Change-Id: Ibb1d78ba9e0050bfc81740d2533e93d3513edb36
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
-rw-r--r-- | src/mqtt/qmqttconnection.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mqtt/qmqttconnection.cpp b/src/mqtt/qmqttconnection.cpp index 7c6b0cf..4db53c1 100644 --- a/src/mqtt/qmqttconnection.cpp +++ b/src/mqtt/qmqttconnection.cpp @@ -106,7 +106,11 @@ bool QMqttConnection::ensureTransport(bool createSecureIfNeeded) new QTcpSocket(); m_transport = socket; m_ownTransport = true; - m_transportType = createSecureIfNeeded ? QMqttClient::SecureSocket : QMqttClient::AbstractSocket; + m_transportType = +#ifndef QT_NO_SSL + createSecureIfNeeded ? QMqttClient::SecureSocket : +#endif + QMqttClient::AbstractSocket; connect(socket, &QAbstractSocket::connected, this, &QMqttConnection::transportConnectionEstablished); connect(socket, &QAbstractSocket::disconnected, this, &QMqttConnection::transportConnectionClosed); |