diff --git a/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.cpp b/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.cpp index 1e90d4ccd..92da14a2b 100644 --- a/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.cpp +++ b/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.cpp @@ -55,7 +55,7 @@ * QxtSslServer is only available if Qt was compiled with OpenSSL support. */ -#if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL) +#if defined(QT_SECURETRANSPORT) || !defined(QT_NO_OPENSSL) #include class QxtSslServerPrivate : public QxtPrivate diff --git a/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.h b/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.h index 87c8f34f2..aceddeb86 100644 --- a/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.h +++ b/thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.h @@ -35,7 +35,7 @@ #include "qxtglobal.h" #include -#if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL) +#if defined(QT_SECURETRANSPORT) || !defined(QT_NO_OPENSSL) #include class QxtSslServerPrivate; diff --git a/thirdparty/qxt/qxtweb-standalone/web/qxtabstracthttpconnector.h b/thirdparty/qxt/qxtweb-standalone/web/qxtabstracthttpconnector.h index af10737f1..fbf5a0528 100644 --- a/thirdparty/qxt/qxtweb-standalone/web/qxtabstracthttpconnector.h +++ b/thirdparty/qxt/qxtweb-standalone/web/qxtabstracthttpconnector.h @@ -95,7 +95,7 @@ private: QXT_DECLARE_PRIVATE(QxtHttpServerConnector) }; -#if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL) +#if defined(QT_SECURETRANSPORT) || !defined(QT_NO_OPENSSL) class QXT_WEB_EXPORT QxtHttpsServerConnector : public QxtHttpServerConnector { Q_OBJECT diff --git a/thirdparty/qxt/qxtweb-standalone/web/qxthttpserverconnector.cpp b/thirdparty/qxt/qxtweb-standalone/web/qxthttpserverconnector.cpp index 04c4e8af9..cdfcaf996 100644 --- a/thirdparty/qxt/qxtweb-standalone/web/qxthttpserverconnector.cpp +++ b/thirdparty/qxt/qxtweb-standalone/web/qxthttpserverconnector.cpp @@ -191,7 +191,7 @@ void QxtHttpServerConnector::writeHeaders(QIODevice* device, const QHttpResponse device->write(header.toString().toUtf8()); } -#if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL) +#if defined(QT_SECURETRANSPORT) || !defined(QT_NO_OPENSSL) /*! * Creates a QxtHttpsServerConnector with the given \a parent. */ diff --git a/thirdparty/qxt/qxtweb-standalone/web/qxthttpsessionmanager.cpp b/thirdparty/qxt/qxtweb-standalone/web/qxthttpsessionmanager.cpp index 2ba95514f..c0d87277b 100644 --- a/thirdparty/qxt/qxtweb-standalone/web/qxthttpsessionmanager.cpp +++ b/thirdparty/qxt/qxtweb-standalone/web/qxthttpsessionmanager.cpp @@ -68,7 +68,7 @@ posting events. It is reentrant for all other functionality. #include #include #include -#if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL) +#if defined(QT_SECURETRANSPORT) || !defined(QT_NO_OPENSSL) #include #endif @@ -437,7 +437,7 @@ void QxtHttpSessionManager::incomingRequest(quint32 requestID, const QHttpReques if (socket) { event->remoteAddress = socket->peerAddress(); -#if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL) +#if defined(QT_SECURETRANSPORT) || !defined(QT_NO_OPENSSL) QSslSocket* sslSocket = qobject_cast(socket); if(sslSocket) { event->isSecure = true; diff --git a/thirdparty/qxt/qxtweb-standalone/web/qxtwebevent.h b/thirdparty/qxt/qxtweb-standalone/web/qxtwebevent.h index b22f4b3c2..5dd1a0148 100644 --- a/thirdparty/qxt/qxtweb-standalone/web/qxtwebevent.h +++ b/thirdparty/qxt/qxtweb-standalone/web/qxtwebevent.h @@ -41,7 +41,7 @@ #include #include #include -#if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL) +#if defined(QT_SECURETRANSPORT) || !defined(QT_NO_OPENSSL) #include #endif QT_FORWARD_DECLARE_CLASS(QIODevice) @@ -89,7 +89,7 @@ public: QString method; QHostAddress remoteAddress; bool isSecure; -#if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL) +#if defined(QT_SECURETRANSPORT) || !defined(QT_NO_OPENSSL) QSslCertificate clientCertificate; #endif