X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorenetwork.cpp;h=798f27c8caa064860672ab9cb782bffb8f27f6e8;hp=206b0194bd7a0d253e47248fac6ae8f80c63f641;hb=e53fc69a91553b57932ba599b39999d550114588;hpb=ac6b164b8b758deff3ebc3946177988e6d72ca9a

diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp
index 206b0194..798f27c8 100644
--- a/src/core/corenetwork.cpp
+++ b/src/core/corenetwork.cpp
@@ -185,7 +185,6 @@ void CoreNetwork::connectToIrc(bool reconnecting)
     enablePingTimeout();
 
 #ifdef HAVE_SSL
-    socket.setProtocol((QSsl::SslProtocol)server.sslVersion);
     if (server.useSsl) {
         CoreIdentity *identity = identityPtr();
         if (identity) {
@@ -438,9 +437,9 @@ void CoreNetwork::socketInitialized()
     if (server.useSsl && !socket.isEncrypted())
         return;
 #endif
-
+#if QT_VERSION >= 0x040600
     socket.setSocketOption(QAbstractSocket::KeepAliveOption, true);
-
+#endif
     CoreIdentity *identity = identityPtr();
     if (!identity) {
         qCritical() << "Identity invalid!";