Commit a5c85e32 authored by Aleksey Lysenko's avatar Aleksey Lysenko
Browse files

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: default avatarTimur Pocheptsov <timur.pocheptsov@qt.io>
Showing with 2 additions and 2 deletions
......@@ -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,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment