From: Kurt Pattyn <pattyn.kurt@gmail.com>
Date: Mon, 18 Nov 2013 22:52:09 +0000 (+0100)
Subject: Wrap SECURE_MODE in ifdef statements
X-Git-Tag: v5.3.0-alpha1~103
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12a415503ed2579f8d9773a983ef34b1b0817caa;p=contrib%2Fqtwebsockets.git

Wrap SECURE_MODE in ifdef statements

Change-Id: Ie936ea7db14ed34fa0cb53030447bba6cbc83a4e
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
---

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
 }
 
 /*!