diff options
| author | Kurt Pattyn <pattyn.kurt@gmail.com> | 2013-11-18 23:52:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-19 00:11:50 +0100 |
| commit | 12a415503ed2579f8d9773a983ef34b1b0817caa (patch) | |
| tree | 98a735a7a0b975e8bfcdb5cf70aaa1ae3a359719 | |
| parent | 216ed447ecbd2926a5f0327eebd533e41901fe7b (diff) | |
| download | qtwebsockets-12a415503ed2579f8d9773a983ef34b1b0817caa.tar.gz | |
Wrap SECURE_MODE in ifdef statements
Change-Id: Ie936ea7db14ed34fa0cb53030447bba6cbc83a4e
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| -rw-r--r-- | src/websockets/qwebsocketserver.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
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 } /*! |