Wrap SECURE_MODE in ifdef statements
authorKurt Pattyn <pattyn.kurt@gmail.com>
Mon, 18 Nov 2013 22:52:09 +0000 (23:52 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 18 Nov 2013 23:11:50 +0000 (00:11 +0100)
Change-Id: Ie936ea7db14ed34fa0cb53030447bba6cbc83a4e
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
src/websockets/qwebsocketserver.cpp

index 176de35..461e75f 100644 (file)
@@ -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
 }
 
 /*!