diff options
| author | Niels Ole Salscheider <niels_ole@salscheider-online.de> | 2018-06-23 17:20:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-23 17:20:47 +0200 |
| commit | ed6b199dff15ddb4c6bd72d1565501e9f1a2bf87 (patch) | |
| tree | 7bbb53c40ecf53fe9464b53b7966dd7726eeac5e /src/server/QXmppServer.cpp | |
| parent | ea83c77a5a4524cc9778336b10eff60979582980 (diff) | |
| parent | 31f0a42073b68823e85835ec3e25114d79705a04 (diff) | |
| download | qxmpp-ed6b199dff15ddb4c6bd72d1565501e9f1a2bf87.tar.gz | |
Merge pull request #131 from olesalscheider/cmake
Add CMake build system, drop Qt4 support
Diffstat (limited to 'src/server/QXmppServer.cpp')
| -rw-r--r-- | src/server/QXmppServer.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp index 13be2169..73a7415e 100644 --- a/src/server/QXmppServer.cpp +++ b/src/server/QXmppServer.cpp @@ -891,11 +891,7 @@ QXmppSslServer::~QXmppSslServer() delete d; } -#if QT_VERSION < 0x050000 -void QXmppSslServer::incomingConnection(int socketDescriptor) -#else void QXmppSslServer::incomingConnection(qintptr socketDescriptor) -#endif { QSslSocket *socket = new QSslSocket; if (!socket->setSocketDescriptor(socketDescriptor)) { |