X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=4a5a64ee05c75af6958c8a6160aa4d8f63bc1fd2;hp=dd33cec542f80c163da4522f59f198afb19e231d;hb=8f50c6cce47eaae781de54eabb0dbff3cfc8b451;hpb=e128a8ef50a0a3fce1d75d7d06121b2ea6c74d6a diff --git a/src/core/core.cpp b/src/core/core.cpp index dd33cec5..4a5a64ee 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -433,7 +433,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuildDate) .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime().toString(Qt::TextDate)); -#ifndef QT_NO_OPENSSL +#ifdef HAVE_SSL SslServer *sslServer = qobject_cast(&server); QSslSocket *sslSocket = qobject_cast(socket); bool supportSsl = (bool)sslServer && (bool)sslSocket && sslServer->certIsValid(); @@ -472,7 +472,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { reply["MsgType"] = "ClientInitAck"; SignalProxy::writeDataToDevice(socket, reply); -#ifndef QT_NO_OPENSSL +#ifdef HAVE_SSL // after we told the client that we are ssl capable we switch to ssl mode if(supportSsl && msg["UseSsl"].toBool()) { quDebug() << qPrintable(tr("Starting TLS for Client:")) << qPrintable(socket->peerAddress().toString()); @@ -597,7 +597,7 @@ SessionThread *Core::createSession(UserId uid, bool restore) { return sess; } -#ifndef QT_NO_OPENSSL +#ifdef HAVE_SSL void Core::sslErrors(const QList &errors) { Q_UNUSED(errors); QSslSocket *socket = qobject_cast(sender());