From 12a415503ed2579f8d9773a983ef34b1b0817caa Mon Sep 17 00:00:00 2001 From: Kurt Pattyn Date: Mon, 18 Nov 2013 23:52:09 +0100 Subject: [PATCH] Wrap SECURE_MODE in ifdef statements Change-Id: Ie936ea7db14ed34fa0cb53030447bba6cbc83a4e Reviewed-by: Kurt Pattyn --- src/websockets/qwebsocketserver.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/websockets/qwebsocketserver.cpp b/src/websockets/qwebsocketserver.cpp index 176de35..461e75f 100644 --- a/src/websockets/qwebsocketserver.cpp +++ b/src/websockets/qwebsocketserver.cpp @@ -146,10 +146,17 @@ QT_BEGIN_NAMESPACE QWebSocketServer::QWebSocketServer(const QString &serverName, SecureMode secureMode, QObject *parent) : QObject(parent), d_ptr(new QWebSocketServerPrivate(serverName, + #ifndef QT_NO_SSL (secureMode == SECURE_MODE) ? QWebSocketServerPrivate::SECURE_MODE : QWebSocketServerPrivate::NON_SECURE_MODE, + #else + QWebSocketServerPrivate::NON_SECURE_MODE, + #endif this, this)) { +#ifdef QT_NO_SSL + Q_UNUSED(secureMode) +#endif } /*! @@ -362,8 +369,12 @@ QHostAddress QWebSocketServer::serverAddress() const QWebSocketServer::SecureMode QWebSocketServer::secureMode() const { Q_D(const QWebSocketServer); +#ifndef QT_NO_SSL return (d->secureMode() == QWebSocketServerPrivate::SECURE_MODE) ? QWebSocketServer::SECURE_MODE : QWebSocketServer::NON_SECURE_MODE; +#else + return QWebSocketServer::NON_SECURE_MODE; +#endif } /*! -- 2.7.4