X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fsslserver.h;h=2b63abd7feab3c559fa7bf8ad7b752a5328cb9db;hb=af787c6830e12c665572044db1beab65473607b9;hp=9a5d482a99e9e6a0b2c4dae35bddd76ce5cb46a7;hpb=9d54503555534a2c554f09a33df6afa33d6308ec;p=quassel.git

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index 9a5d482a..2b63abd7 100644
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -43,8 +43,13 @@ public:
     virtual inline bool isCertValid() const { return _isCertValid; }
 
 protected:
+#if QT_VERSION >= 0x050000
+    virtual void incomingConnection(qintptr socketDescriptor);
+#else
     virtual void incomingConnection(int socketDescriptor);
-    virtual bool setCertificate(const QString &path);
+#endif
+
+    virtual bool setCertificate(const QString &path, const QString &keyPath);
 
 private:
     QLinkedList<QTcpSocket *> _pendingConnections;