fix compilation with QT_NO_NETWORKPROXY

[contrib/qtwebsockets.git] / src / websockets / qwebsocket_p.cpp

diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index bff060f..fb6486e 100644 (file)
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Kurt Pattyn <pattyn.kurt@gmail.com>.
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtWebSockets module of the Qt Toolkit.
@@ -78,9 +78,10 @@ QWebSocketConfiguration::QWebSocketConfiguration() :
     m_ignoredSslErrors(),
     m_ignoreSslErrors(false),
 #endif
-#ifndef QT_NONETWORKPROXY
-    m_proxy(QNetworkProxy::DefaultProxy)
+#ifndef QT_NO_NETWORKPROXY
+    m_proxy(QNetworkProxy::DefaultProxy),
 #endif
+    m_pSocket(Q_NULLPTR)
 {
 }
 
@@ -92,7 +93,7 @@ QWebSocketPrivate::QWebSocketPrivate(const QString &origin, QWebSocketProtocol::
     QObjectPrivate(),
     q_ptr(pWebSocket),
     m_pSocket(),
-    m_errorString(QWebSocket::tr("Unknown error")),
+    m_errorString(),
     m_version(version),
     m_resourceName(),
     m_requestUrl(),
@@ -541,8 +542,10 @@ void QWebSocketPrivate::makeConnections(const QTcpSocket *pTcpSocket)
         QObject::connect(pTcpSocket,
                          static_cast<ASErrorSignal>(&QAbstractSocket::error),
                          q, static_cast<WSErrorSignal>(&QWebSocket::error));
+#ifndef QT_NO_NETWORKPROXY
         QObject::connect(pTcpSocket, &QAbstractSocket::proxyAuthenticationRequired, q,
                          &QWebSocket::proxyAuthenticationRequired);
+#endif
         QObject::connect(pTcpSocket, &QAbstractSocket::readChannelFinished, q,
                          &QWebSocket::readChannelFinished);
         QObject::connect(pTcpSocket, &QAbstractSocket::aboutToClose, q, &QWebSocket::aboutToClose);