1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-16 19:14:06 +02:00

Update qxt to latest upstream git revision

Now we are using plain qxt again as all needed local modifications are
merged upstream.
This commit is contained in:
Uwe L. Korn
2014-08-10 12:00:25 +01:00
parent 4a20e6f5f9
commit c86b629c4a
3 changed files with 39 additions and 16 deletions

View File

@@ -60,9 +60,12 @@ public:
void setAutoEncrypt(bool on);
bool autoEncrypt() const;
void setProtocol(QSsl::SslProtocol proto);
QSsl::SslProtocol protocol() const;
protected:
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
virtual void incomingConnection(qintptr socketDescriptor);
#if QT_VERSION >= 0x050000
virtual void incomingConnection(qintptr socketDescriptor);
#else
virtual void incomingConnection(int socketDescriptor);
#endif