From a5c85e3250a10a8e23ce15f9a6811136f6bb23fd Mon Sep 17 00:00:00 2001 From: Aleksey Lysenko Date: Wed, 14 Dec 2016 10:39:29 +0200 Subject: Fixed QWebSocketServer::SslMode collision Value of NonSecureMode enumerator depends on QT_NO_SSL. If Qt is built with QT_NO_SSL defined, NonSecureMode is equal to 0, otherwise it is equal to 1. It may lead to problem if user built app with libs where NonSecureMode = 0, but run it with libs where NonSecureMode = 1. [ChangeLog][QWebSocketServer] SslMode::NonSecure enumerator now always has the same value (1) regardless of SSL enabled or disabled. Task-number: QTBUG-56129 Change-Id: If17137eff4b19015697c827a985ef89dd95a5611 Reviewed-by: Timur Pocheptsov --- src/websockets/qwebsocketserver.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h index 47113e4..511a55b 100644 --- a/src/websockets/qwebsocketserver.h +++ b/src/websockets/qwebsocketserver.h @@ -69,9 +69,9 @@ class Q_WEBSOCKETS_EXPORT QWebSocketServer : public QObject public: enum SslMode { #ifndef QT_NO_SSL - SecureMode, + SecureMode = 0, #endif - NonSecureMode + NonSecureMode = 1 }; explicit QWebSocketServer(const QString &serverName, SslMode secureMode, -- cgit v1.2.1