X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fclientidentity.cpp;h=04b946e3af218b19d900d572db66d3530a7611a8;hb=3e63cb8a6e83765069a45101b86ae9e21dcc57ad;hp=3507a10b7d5b3efd3e6d20ff5b80ec9f70692258;hpb=0dbec2cfc937857d66a9645249f876f1e6b3f05e;p=quassel.git

diff --git a/src/client/clientidentity.cpp b/src/client/clientidentity.cpp
index 3507a10b..04b946e3 100644
--- a/src/client/clientidentity.cpp
+++ b/src/client/clientidentity.cpp
@@ -23,7 +23,6 @@
 #include "client.h"
 #include "signalproxy.h"
 
-INIT_SYNCABLE_OBJECT(CertIdentity)
 CertIdentity::CertIdentity(IdentityId id, QObject *parent)
     : Identity(id, parent)
 #ifdef HAVE_SSL
@@ -111,10 +110,8 @@ void CertIdentity::markClean()
 void ClientCertManager::setSslKey(const QByteArray &encoded)
 {
     QSslKey key(encoded, QSsl::Rsa);
-#if QT_VERSION >= 0x050500
     if (key.isNull() && Client::isCoreFeatureEnabled(Quassel::Feature::EcdsaCertfpKeys))
         key = QSslKey(encoded, QSsl::Ec);
-#endif
     if (key.isNull())
         key = QSslKey(encoded, QSsl::Dsa);
     _certIdentity->setSslKey(key);
@@ -126,5 +123,4 @@ void ClientCertManager::setSslCert(const QByteArray &encoded)
     _certIdentity->setSslCert(QSslCertificate(encoded));
 }
 
-
 #endif // HAVE_SSL