summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qtlsbackend.cpp
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2021-02-19 15:52:36 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-22 13:00:56 +0000
commit9e5d7af6ef6ead63d653853ec5ece2d46d026a5a (patch)
tree0d80f339430f74e3ba47edd5894e26bc9fb7c9de /src/network/ssl/qtlsbackend.cpp
parentf265736e9fdce7e9d049774f2e9f648f52aef31f (diff)
A follow-up fix for potentially missing OpenSSL symbol resolving
This patch also adds 'isValid()' to know if a backend from a plugin is in working condition (say, there is 'openssl' plugin but no or old openssl libraries in some system). Task-number: QTBUG-65922 Change-Id: I0b846536a069ca8c5a94e7191f11c81bac6ad527 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 573ba145d76f239dbc7464a78aabc06ed4d00419) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/network/ssl/qtlsbackend.cpp')
-rw-r--r--src/network/ssl/qtlsbackend.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/network/ssl/qtlsbackend.cpp b/src/network/ssl/qtlsbackend.cpp
index ac6d965bd3..1df462e362 100644
--- a/src/network/ssl/qtlsbackend.cpp
+++ b/src/network/ssl/qtlsbackend.cpp
@@ -110,8 +110,10 @@ public:
return names;
names.reserve(backends.size());
- for (const auto *factory : backends)
- names.append(factory->backendName());
+ for (const auto *backend : backends) {
+ if (backend->isValid())
+ names.append(backend->backendName());
+ }
return names;
}
@@ -198,6 +200,11 @@ QTlsBackend::~QTlsBackend()
backends->removeBackend(this);
}
+bool QTlsBackend::isValid() const
+{
+ return true;
+}
+
QString QTlsBackend::backendName() const
{
return QStringLiteral("dummyTLS");