X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsslserver.h;h=9b69a8c56f2ee7093d979a240d3077c0bdc3e6a6;hp=dbf28025c81e2d507bed25d61440c2629d748801;hb=56d25331d61b4b24a2805f1cf16e68f722fdaf73;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index dbf28025..9b69a8c5 100644
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 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;