mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-04 21:27:58 +02:00
Code Issues Releases Wiki Activity

[qxt] incomingConnection has a different signature

Browse Source
This commit is contained in:
Uwe L. Korn
2014-06-27 04:36:10 +01:00
parent 99fb4f6305
commit 263f5480e2
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,8 +197,13 @@ bool QxtSslServer::autoEncrypt() const
/*! /*!
* \reimp * \reimp
*/ */
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
void QxtSslServer::incomingConnection(qintptr socketDescriptor)
#else
void QxtSslServer::incomingConnection(int socketDescriptor) void QxtSslServer::incomingConnection(int socketDescriptor)
#endif
{ {
qWarning() << Q_FUNC_INFO << socketDescriptor;
QSslSocket* socket = new QSslSocket(this); QSslSocket* socket = new QSslSocket(this);
if(socket->setSocketDescriptor(socketDescriptor)) { if(socket->setSocketDescriptor(socketDescriptor)) {
socket->setLocalCertificate(qxt_d().localCertificate); socket->setLocalCertificate(qxt_d().localCertificate);

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

@@ -61,7 +61,11 @@ public:
bool autoEncrypt() const; bool autoEncrypt() const;
protected: protected:
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
virtual void incomingConnection(qintptr socketDescriptor);
#else
virtual void incomingConnection(int socketDescriptor); virtual void incomingConnection(int socketDescriptor);
#endif
private: private:
QXT_DECLARE_PRIVATE(QxtSslServer) QXT_DECLARE_PRIVATE(QxtSslServer)