diff options
| author | Maurice Kalinowski <maurice.kalinowski@digia.com> | 2014-03-17 14:06:27 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-17 14:46:07 +0100 |
| commit | 965899ddd1dcbc07c8b6d199fac74e0398bb8b57 (patch) | |
| tree | 3c27d6cc19250b96942f50b4fac00616fbf18858 | |
| parent | 5c7ec14e812f0be0400ffa9ffd80767d23431808 (diff) | |
| download | qtwebsockets-965899ddd1dcbc07c8b6d199fac74e0398bb8b57.tar.gz | |
fix typo in macro
Change-Id: Ib302db81e0667d0c89c1da8611639db0811ff9f3
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 2 | ||||
| -rw-r--r-- | 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 c51ba38..6770388 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 b24d540..5c65450 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; |