mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 13:47:26 +02:00
Code Issues Releases Wiki Activity

Unbreak QXT with SecureTransport on OSX.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2015-10-09 17:36:30 +02:00
parent 282b876332
commit 1c99e2abbc
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.cpp vendored
View File

@@ -55,7 +55,7 @@
* QxtSslServer is only available if Qt was compiled with OpenSSL support. * QxtSslServer is only available if Qt was compiled with OpenSSL support.
*/ */
#ifndef QT_NO_OPENSSL #if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL)
#include <QSslKey> #include <QSslKey>
class QxtSslServerPrivate : public QxtPrivate<QxtSslServer> class QxtSslServerPrivate : public QxtPrivate<QxtSslServer>

2
thirdparty/qxt/qxtweb-standalone/network/qxtsslserver.h vendored
View File

@@ -35,7 +35,7 @@
#include "qxtglobal.h" #include "qxtglobal.h"
#include <QTcpServer> #include <QTcpServer>
#ifndef QT_NO_OPENSSL #if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL)
#include <QSslSocket> #include <QSslSocket>
class QxtSslServerPrivate; class QxtSslServerPrivate;

2
thirdparty/qxt/qxtweb-standalone/web/qxtabstracthttpconnector.h vendored
View File

@@ -95,7 +95,7 @@ private:
QXT_DECLARE_PRIVATE(QxtHttpServerConnector) QXT_DECLARE_PRIVATE(QxtHttpServerConnector)
}; };
#ifndef QT_NO_OPENSSL #if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL)
class QXT_WEB_EXPORT QxtHttpsServerConnector : public QxtHttpServerConnector class QXT_WEB_EXPORT QxtHttpsServerConnector : public QxtHttpServerConnector
{ {
Q_OBJECT Q_OBJECT

2
thirdparty/qxt/qxtweb-standalone/web/qxthttpserverconnector.cpp vendored
View File

@@ -191,7 +191,7 @@ void QxtHttpServerConnector::writeHeaders(QIODevice* device, const QHttpResponse
device->write(header.toString().toUtf8()); device->write(header.toString().toUtf8());
} }
#ifndef QT_NO_OPENSSL #if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL)
/*! /*!
* Creates a QxtHttpsServerConnector with the given \a parent. * Creates a QxtHttpsServerConnector with the given \a parent.
*/ */

4
thirdparty/qxt/qxtweb-standalone/web/qxthttpsessionmanager.cpp vendored
View File

@@ -68,7 +68,7 @@ posting events. It is reentrant for all other functionality.
#include <QThread> #include <QThread>
#include <qxtmetaobject.h> #include <qxtmetaobject.h>
#include <QTcpSocket> #include <QTcpSocket>
#ifndef QT_NO_OPENSSL #if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL)
#include <QSslSocket> #include <QSslSocket>
#endif #endif
@@ -437,7 +437,7 @@ void QxtHttpSessionManager::incomingRequest(quint32 requestID, const QHttpReques
if (socket) if (socket)
{ {
event->remoteAddress = socket->peerAddress(); event->remoteAddress = socket->peerAddress();
#ifndef QT_NO_OPENSSL #if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL)
QSslSocket* sslSocket = qobject_cast<QSslSocket*>(socket); QSslSocket* sslSocket = qobject_cast<QSslSocket*>(socket);
if(sslSocket) { if(sslSocket) {
event->isSecure = true; event->isSecure = true;

4
thirdparty/qxt/qxtweb-standalone/web/qxtwebevent.h vendored
View File

@@ -41,7 +41,7 @@
#include <QMultiHash> #include <QMultiHash>
#include <QDateTime> #include <QDateTime>
#include <QHostAddress> #include <QHostAddress>
#ifndef QT_NO_OPENSSL #if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL)
#include <QSslCertificate> #include <QSslCertificate>
#endif #endif
QT_FORWARD_DECLARE_CLASS(QIODevice) QT_FORWARD_DECLARE_CLASS(QIODevice)
@@ -89,7 +89,7 @@ public:
QString method; QString method;
QHostAddress remoteAddress; QHostAddress remoteAddress;
bool isSecure; bool isSecure;
#ifndef QT_NO_OPENSSL #if defined(QT_SECURETRANSPORT) || defined(QT_OPENSSL)
QSslCertificate clientCertificate; QSslCertificate clientCertificate;
#endif #endif