From 965899ddd1dcbc07c8b6d199fac74e0398bb8b57 Mon Sep 17 00:00:00 2001
From: Maurice Kalinowski <maurice.kalinowski@digia.com>
Date: Mon, 17 Mar 2014 14:06:27 +0100
Subject: [PATCH] fix typo in macro
Change-Id: Ib302db81e0667d0c89c1da8611639db0811ff9f3
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
---
src/websockets/qwebsocket_p.cpp | 2 +-
src/websockets/qwebsocket_p.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index c51ba38d..67703884 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -78,7 +78,7 @@ QWebSocketConfiguration::QWebSocketConfiguration() :
m_ignoredSslErrors(),
m_ignoreSslErrors(false),
#endif
-#ifndef QT_NONETWORKPROXY
+#ifndef QT_NO_NETWORKPROXY
m_proxy(QNetworkProxy::DefaultProxy)
#endif
{
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h
index b24d540a..5c654504 100644
--- a/src/websockets/qwebsocket_p.h
+++ b/src/websockets/qwebsocket_p.h
@@ -91,7 +91,7 @@ public:
QList<QSslError> m_ignoredSslErrors;
bool m_ignoreSslErrors;
#endif
-#ifndef QT_NONETWORKPROXY
+#ifndef QT_NO_NETWORKPROXY
QNetworkProxy m_proxy;
#endif
QTcpSocket *m_pSocket;
--
GitLab