Commit de797b5c authored by Pino Toscano's avatar Pino Toscano

Merge remote-tracking branch 'origin/Applications/17.08'

parents 7aafd8a6 e0737299
......@@ -31,6 +31,7 @@
#include <QHostInfo>
#include <QProgressBar>
#include <QTimer>
#include <QSet>
// KDE
#include "mailtransport_debug.h"
......@@ -51,7 +52,7 @@ public:
MailTransport::Socket *normalSocket;
MailTransport::Socket *secureSocket;
QVector< int > connectionResults;
QSet< int > connectionResults;
QHash< int, QVector<int> > authenticationResults;
QSet< ServerTest::Capability > capabilityResults;
QHash< int, uint > customPorts;
......@@ -121,7 +122,13 @@ void ServerTestPrivate::finalResult()
normalSocketFinished = false;
tlsFinished = false;
emit q->finished(connectionResults);
QVector<int> resultsAsVector;
resultsAsVector.reserve(connectionResults.size());
foreach (int res, connectionResults) {
resultsAsVector.append(res);
}
emit q->finished(resultsAsVector);
}
QVector<int> ServerTestPrivate::parseAuthenticationList(const QStringList &authentications)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment