<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6c0012c9bc722ea575873958c267d3fe8ababa68">https://github.com/macports/macports-ports/commit/6c0012c9bc722ea575873958c267d3fe8ababa68</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6c0012c9bc722ea575873958c267d3fe8ababa68
</span>Author: Rene J. V. Bertin <rjvbertin@gmail.com>
AuthorDate: Wed Nov 17 18:57:58 2021 -0500

<span style='display:block; white-space:pre;color:#404040;'>    qca-qt5: patch to support 10.7 and 10.8
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/63983
</span>---
 devel/qca/files/qt5/patch-support-older-qt5.diff | 240 ++++++++++++++++++++++-
 1 file changed, 237 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qca/files/qt5/patch-support-older-qt5.diff b/devel/qca/files/qt5/patch-support-older-qt5.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fca91eff922..7ad96b9b08c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qca/files/qt5/patch-support-older-qt5.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qca/files/qt5/patch-support-older-qt5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,10 +13,24 @@ index 6e290245cb9d4c7b6a208dbe245aab3105f4fd0a..ffaeaf43d6d8da08084dabe9a6498274
</span>  
  set(CMAKE_AUTOMOC ON)
 diff --git a/plugins/qca-gnupg/gpgaction.cpp b/plugins/qca-gnupg/gpgaction.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c739dd1a7f63c18fe68f256ac91622299460215e..22efab0d2a0171da55173269d4a785d36cc2d501 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c739dd1a7f63c18fe68f256ac91622299460215e..314659dec708a5367a28ac69bec520ec000136e2 100644
</span> --- a/plugins/qca-gnupg/gpgaction.cpp
 +++ b/plugins/qca-gnupg/gpgaction.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -586,6 +586,12 @@ void GpgAction::processStatusLine(const QString &line)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,13 @@ static QDateTime getTimestamp(const QString &s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (s.contains(QLatin1Char('T'))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return QDateTime::fromString(s, Qt::ISODate);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return QDateTime::fromSecsSinceEpoch(s.toInt());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        QDateTime dt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        dt.setTime_t(s.toInt());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        return dt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -586,6 +592,12 @@ void GpgAction::processStatusLine(const QString &line)
</span>      QString s, rest;
      s = nextArg(line, &rest);
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +43,7 @@ index c739dd1a7f63c18fe68f256ac91622299460215e..22efab0d2a0171da55173269d4a785d3
</span>      if (s == QLatin1String("NODATA")) {
          // only set this if it'll make it better
          if (curError == GpgOp::ErrorUnknown)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -665,12 +671,12 @@ void GpgAction::processStatusLine(const QString &line)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -665,12 +677,12 @@ void GpgAction::processStatusLine(const QString &line)
</span>          output.verifyResult = GpgOp::VerifyBad;
      } else if (s == QLatin1String("ERRSIG")) {
          output.wasSigned       = true;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -256,3 +270,223 @@ index a94d15cc4db598d42b6d6d884be9a6186d27e76c..c4b6812034f50e6206d83e3d292df60c
</span>      QCOMPARE(testString, QStringLiteral("4000000000000-40000000000002000000000000\n"));
  
      // Botan's addition tests
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/qca_default.cpp b/src/qca_default.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 294b90565e50c493da36eb6a5ba998fe2cb48645..5c8b7c3e113f7f2f7cb9151f5b4b8464e388b8f0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/qca_default.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/qca_default.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1250,7 +1250,12 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         const QDateTime now = QDateTime::currentDateTime();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         uint t = now.toSecsSinceEpoch();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        // implementation from v2.2.1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        uint t = now.toTime_t();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if (now.time().msec() > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             t /= now.time().msec();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         std::srand(t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/support/logger.cpp b/src/support/logger.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cda4ee46b8a83c2a341135320c7ea7437c6eba82..bdd22d008664102a2ea0946563572d141e44aa26 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/support/logger.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/support/logger.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "qca_support.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++namespace QtPrivate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <typename T> struct QAddConst { typedef const T Type; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// this adds const to non-const objects (like std::as_const)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <typename T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Q_DECL_CONSTEXPR typename QtPrivate::QAddConst<T>::Type &qAsConst(T &t) Q_DECL_NOTHROW { return t; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// prevent rvalue arguments:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <typename T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void qAsConst(const T &&) Q_DECL_EQ_DELETE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace QCA {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AbstractLogDevice::AbstractLogDevice(const QString &name, QObject *parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/plugins/qca-botan/qca-botan.cpp b/plugins/qca-botan/qca-botan.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e335edbff3c4b620885cb0e8a745c98f84c4de73..51187b9b44fb868098c6d7ca9111cf89277b2e1a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/plugins/qca-botan/qca-botan.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/plugins/qca-botan/qca-botan.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdlib>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++namespace QtPrivate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <typename T> struct QAddConst { typedef const T Type; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// this adds const to non-const objects (like std::as_const)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <typename T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Q_DECL_CONSTEXPR typename QtPrivate::QAddConst<T>::Type &qAsConst(T &t) Q_DECL_NOTHROW { return t; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// prevent rvalue arguments:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <typename T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void qAsConst(const T &&) Q_DECL_EQ_DELETE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //-----------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class botanRandomContext : public QCA::RandomContext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/plugins/qca-gnupg/gpgproc/gpgproc_p.h b/plugins/qca-gnupg/gpgproc/gpgproc_p.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7c21f251b49b7bdcd141f62608501dcc502d93ff..73ab82aa76e78f037ea928fb38f3a9c9e674a42b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/plugins/qca-gnupg/gpgproc/gpgproc_p.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/plugins/qca-gnupg/gpgproc/gpgproc_p.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,11 +46,15 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 &QProcessSignalRelay::proc_readyReadStandardError,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 Qt::QueuedConnection);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(proc, &QProcess::bytesWritten, this, &QProcessSignalRelay::proc_bytesWritten, Qt::QueuedConnection);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(proc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 this,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 &QProcessSignalRelay::proc_finished,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 Qt::QueuedConnection);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        connect(proc, SIGNAL(finished(int)), SLOT(proc_finished(int)), Qt::QueuedConnection);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(proc, &QProcess::errorOccurred, this, &QProcessSignalRelay::proc_error, Qt::QueuedConnection);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9c81746844f9d8543f7e9eff8603662f495d7a1e..74c5f49c6754b0350a3367ac90d404e4e756b2b2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/plugins/qca-ossl/qca-ossl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/plugins/qca-ossl/qca-ossl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3474,8 +3475,13 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         BN_free(bn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         // validity period
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ASN1_TIME_set(X509_get_notBefore(x), opts.notValidBefore().toSecsSinceEpoch());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ASN1_TIME_set(X509_get_notAfter(x), opts.notValidAfter().toSecsSinceEpoch());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        ASN1_TIME_set(X509_get_notBefore(x), opts.notValidBefore().toTime_t());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        ASN1_TIME_set(X509_get_notAfter(x), opts.notValidAfter().toTime_t());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         // public key
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         X509_set_pubkey(x, pk);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3878,8 +3884,13 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         BN_free(bn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         // validity period
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ASN1_TIME_set(X509_get_notBefore(x), QDateTime::currentDateTimeUtc().toSecsSinceEpoch());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ASN1_TIME_set(X509_get_notAfter(x), notValidAfter.toSecsSinceEpoch());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        ASN1_TIME_set(X509_get_notBefore(x), QDateTime::currentDateTimeUtc().toTime_t());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        ASN1_TIME_set(X509_get_notAfter(x), notValidAfter.toTime_t());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         X509_set_pubkey(x, static_cast<const MyPKeyContext *>(req.subjectPublicKey())->get_pkey());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         X509_set_subject_name(x, subjectName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/plugins/qca-pkcs11/qca-pkcs11.cpp b/plugins/qca-pkcs11/qca-pkcs11.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ae13bf0a3c34f87614f446ecebd32fa43976e611..3d707d5b1f1d2f1ff0e81dd9b53d48a818263960 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/plugins/qca-pkcs11/qca-pkcs11.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/plugins/qca-pkcs11/qca-pkcs11.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1048,8 +1048,11 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         Certificate cert = Certificate::fromDER(QByteArray((char *)blob, blob_size));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         *expiration = cert.notValidAfter().toSecsSinceEpoch();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        *expiration = cert.notValidAfter().toTime_t();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return TRUE; // krazy:exclude=captruefalse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/examples/saslclient/saslclient.cpp b/examples/saslclient/saslclient.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 99db413c63bdbecc185e468e6357458a614c4eed..7e0613d7be8e175a0800c5b1fddb0bb23f1dc62e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/examples/saslclient/saslclient.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/examples/saslclient/saslclient.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -152,8 +152,10 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, &QTcpSocket::readyRead, this, &ClientTest::sock_readyRead);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, &QTcpSocket::errorOccurred, this, &ClientTest::sock_error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), this, &ClientTest::sock_error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(sock_error(QAbstractSocket::SocketError)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         sasl = new QCA::SASL(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/examples/saslserver/saslserver.cpp b/examples/saslserver/saslserver.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0983dc7e82e8b48769a68a9ff9db3c3721dbd26a..4cb5a8806561e6e4300db8857cee559c89519c92 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/examples/saslserver/saslserver.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/examples/saslserver/saslserver.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,11 +183,13 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, &QTcpSocket::readyRead, this, &ServerTestHandler::sock_readyRead);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, &QTcpSocket::errorOccurred, this, &ServerTestHandler::sock_error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 this,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 &ServerTestHandler::sock_error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(sock_error(QAbstractSocket::SocketError)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, &QTcpSocket::bytesWritten, this, &ServerTestHandler::sock_bytesWritten);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/examples/sslservtest/sslservtest.cpp b/examples/sslservtest/sslservtest.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4e4cfd4d3b4bd7c877c442cb5a3f0f759c194823..85f203d5dcdfcd25e461b5ce20a1d55f84b71446 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/examples/sslservtest/sslservtest.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/examples/sslservtest/sslservtest.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,8 +162,10 @@ private Q_SLOTS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, &QTcpSocket::disconnected, this, &SecureServer::sock_disconnected);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, &QTcpSocket::errorOccurred, this, &SecureServer::sock_error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), this, &SecureServer::sock_error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(sock_error(QAbstractSocket::SocketError)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, &QTcpSocket::bytesWritten, this, &SecureServer::sock_bytesWritten);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/examples/ssltest/ssltest.cpp b/examples/ssltest/ssltest.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 471bd119e1fcd14aff8a1dc20a0d49ee54df770f..166faf6bbe52a515187f9f3cbc676763e9b28588 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/examples/ssltest/ssltest.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/examples/ssltest/ssltest.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,8 +114,10 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, &QTcpSocket::readyRead, this, &SecureTest::sock_readyRead);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, &QTcpSocket::errorOccurred, this, &SecureTest::sock_error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), this, &SecureTest::sock_error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(sock_error(QAbstractSocket::SocketError)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ssl = new QCA::TLS;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/examples/tlssocket/tlssocket.cpp b/examples/tlssocket/tlssocket.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9264d8939b00ab82765dae4015108c3ee2f3ee94..e711ba4c34097cce5aab57f4134b759657ebff73 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/examples/tlssocket/tlssocket.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/examples/tlssocket/tlssocket.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,11 +50,13 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, &QTcpSocket::bytesWritten, this, &TLSSocket::Private::sock_bytesWritten);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock, &QTcpSocket::errorOccurred, this, &TLSSocket::Private::sock_error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         connect(sock,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 this,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 &TLSSocket::Private::sock_error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(sock_error(QAbstractSocket::SocketError)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         tls = new QCA::TLS(this);
</span></pre><pre style='margin:0'>

</pre>