Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove qt4 support
  • Loading branch information
pvuorela committed Oct 10, 2016
1 parent a4266d0 commit 6eff895
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 29 deletions.
25 changes: 0 additions & 25 deletions libssu/ssu.cpp
Expand Up @@ -10,10 +10,7 @@
#include <QDBusConnection>
#include <QDBusMessage>
#include <QDBusPendingReply>

#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <QUrlQuery>
#endif

#include <getdef.h>
#include <pwd.h>
Expand Down Expand Up @@ -275,23 +272,13 @@ void Ssu::requestFinished(QNetworkReply *reply)
QNetworkRequest request = reply->request();
QVariant originalDomainVariant = request.attribute(SSU_NETWORK_REQUEST_DOMAIN_DATA);

#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
ssuLog->print(LOG_DEBUG, QString("Certificate used was issued for '%1' by '%2'. Complete chain:")
.arg(sslConfiguration.peerCertificate().subjectInfo(QSslCertificate::CommonName).join(""))
.arg(sslConfiguration.peerCertificate().issuerInfo(QSslCertificate::CommonName).join("")));

foreach (const QSslCertificate cert, sslConfiguration.peerCertificateChain()) {
ssuLog->print(LOG_DEBUG, QString("-> %1").arg(cert.subjectInfo(QSslCertificate::CommonName).join("")));
}
#else
ssuLog->print(LOG_DEBUG, QString("Certificate used was issued for '%1' by '%2'. Complete chain:")
.arg(sslConfiguration.peerCertificate().subjectInfo(QSslCertificate::CommonName))
.arg(sslConfiguration.peerCertificate().issuerInfo(QSslCertificate::CommonName)));

foreach (const QSslCertificate cert, sslConfiguration.peerCertificateChain()) {
ssuLog->print(LOG_DEBUG, QString("-> %1").arg(cert.subjectInfo(QSslCertificate::CommonName)));
}
#endif

pendingRequests--;

Expand Down Expand Up @@ -433,7 +420,6 @@ void Ssu::sendRegistration(QString usernameDomain, QString password)

QUrl form;

#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
QUrlQuery q;
q.addQueryItem("protocolVersion", SSU_PROTOCOL_VERSION);
q.addQueryItem("deviceModel", deviceInfo.deviceModel());
Expand All @@ -442,25 +428,14 @@ void Ssu::sendRegistration(QString usernameDomain, QString password)
}

form.setQuery(q);
#else
form.addQueryItem("protocolVersion", SSU_PROTOCOL_VERSION);
form.addQueryItem("deviceModel", deviceInfo.deviceModel());
if (!domain().isEmpty()) {
form.addQueryItem("domain", domain());
}
#endif

ssuLog->print(LOG_DEBUG, QString("Sending request to %1")
.arg(request.url().url()));

QNetworkReply *reply;

pendingRequests++;
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
reply = manager->post(request, form.query(QUrl::FullyEncoded).toStdString().c_str());
#else
reply = manager->post(request, form.encodedQuery());
#endif
// we could expose downloadProgress() from reply in case we want progress info

QString homeUrl = settings->value("home-url").toString().arg(username);
Expand Down
4 changes: 0 additions & 4 deletions ssu.pro
@@ -1,7 +1,3 @@
contains(QT_VERSION, ^4\\.[0-7]\\..*) {
error("Can't build with Qt version $${QT_VERSION}. Use at least Qt 4.8.")
}

TEMPLATE = subdirs
SUBDIRS = libssu libssunetworkproxy ssud
SUBDIRS += ssucli ssuurlresolver ssuks
Expand Down

0 comments on commit 6eff895

Please sign in to comment.