qa: Resolve deprecation warnings in newer Qt versions

- Use QSslConfiguration instead of modifying QSslSocket directly
- Use default constructors instead of nullptr for empty QFlags

diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index 2c238ba..030423f 100644 (file)
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -1533,7 +1533,7 @@ Message::Types PostgreSqlStorage::bufferActivity(BufferId bufferId, MsgId lastSe
     query.bindValue(":lastseenmsgid", lastSeenMsgId.toQint64());
     safeExec(query);
     watchQuery(query);
     query.bindValue(":lastseenmsgid", lastSeenMsgId.toQint64());
     safeExec(query);
     watchQuery(query);

-    Message::Types result = Message::Types(nullptr);
+    Message::Types result{};

     if (query.first())
         result = Message::Types(query.value(0).toInt());
     return result;
     if (query.first())
         result = Message::Types(query.value(0).toInt());
     return result;

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 8ee8f88..b7a07fd 100644 (file)
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -1652,7 +1652,7 @@ Message::Types SqliteStorage::bufferActivity(BufferId bufferId, MsgId lastSeenMs
     QSqlDatabase db = logDb();
     db.transaction();
 
     QSqlDatabase db = logDb();
     db.transaction();
 

-    Message::Types result = Message::Types(nullptr);
+    Message::Types result{};

     {
         QSqlQuery query(db);
         query.prepare(queryString("select_buffer_bufferactivity"));
     {
         QSqlQuery query(db);
         query.prepare(queryString("select_buffer_bufferactivity"));

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index f7d35c3..9c3c7ed 100644 (file)
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -21,6 +21,7 @@
 #include "sslserver.h"
 
 #include <QDateTime>
 #include "sslserver.h"
 
 #include <QDateTime>

+#include <QSslConfiguration>

 #include <QSslSocket>
 
 #include "core.h"
 #include <QSslSocket>
 
 #include "core.h"


@@ -62,9 +63,13 @@ void SslServer::incomingConnection(qintptr socketDescriptor)
     auto* socket = new QSslSocket(this);
     if (socket->setSocketDescriptor(socketDescriptor)) {
         if (isCertValid()) {
     auto* socket = new QSslSocket(this);
     if (socket->setSocketDescriptor(socketDescriptor)) {
         if (isCertValid()) {

-            socket->setLocalCertificate(_cert);
-            socket->setPrivateKey(_key);
-            socket->addCaCertificates(_ca);
+            auto config = socket->sslConfiguration();
+            config.setLocalCertificate(_cert);
+            config.setPrivateKey(_key);
+            auto certificates = config.caCertificates();
+            certificates += _ca;
+            config.setCaCertificates(certificates);
+            socket->setSslConfiguration(config);

         }
         addPendingConnection(socket);
     }
         }
         addPendingConnection(socket);
     }


@@ -215,7 +220,8 @@ QSslKey SslServer::loadKey(QFile* keyFile)
     return key;
 }
 
     return key;
 }
 

-void SslServer::setMetricsServer(MetricsServer* metricsServer) {
+void SslServer::setMetricsServer(MetricsServer* metricsServer)
+{

     _metricsServer = metricsServer;
     if (_metricsServer) {
         _metricsServer->setCertificateExpires(_certificateExpires);
     _metricsServer = metricsServer;
     if (_metricsServer) {
         _metricsServer->setCertificateExpires(_certificateExpires);