X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=b65ba5664faf90ed5cdc0cdc22974d5cb4cff69b;hb=refs%2Fheads%2F0.3.0-backport;hp=79d8c91fb09b89ee6ac953e3cb143dcd47ce4c5f;hpb=332069a1830ed3a055ac6f2d7661bae1cc83e40c;p=quassel.git diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp index 79d8c91f..b65ba566 100644 --- a/src/client/clientsyncer.cpp +++ b/src/client/clientsyncer.cpp @@ -124,7 +124,7 @@ void ClientSyncer::connectToCore(const QVariantMap &conn) { //emit coreConnectionMsg(tr("Connecting...")); Q_ASSERT(!socket); -#ifndef QT_NO_OPENSSL +#ifdef HAVE_SSL QSslSocket *sock = new QSslSocket(Client::instance()); #else if(conn["useSsl"].toBool()) { @@ -196,7 +196,7 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) { } emit connectionMsg(msg["CoreInfo"].toString()); -#ifndef QT_NO_OPENSSL +#ifdef HAVE_SSL if(coreConnectionInfo["useSsl"].toBool()) { if(msg["SupportSsl"].toBool()) { QSslSocket *sslSocket = qobject_cast(socket); @@ -219,7 +219,7 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) { socket->setProperty("UseCompression", true); } #endif - + if(!msg["Configured"].toBool()) { // start wizard emit startCoreSetup(msg["StorageBackends"].toList()); @@ -299,7 +299,7 @@ void ClientSyncer::checkSyncState() { } } -#ifndef QT_NO_OPENSSL +#ifdef HAVE_SSL void ClientSyncer::sslErrors(const QList &errors) { qDebug() << "SSL Errors:"; foreach(QSslError err, errors)