From ee85f65b8e063921e7fc3c1899e70ba5de289b95 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Fri, 30 Sep 2022 09:02:50 +0200 Subject: tst_qsslcertificate: remove ifery which breaks the test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the presence of QT_CONFIG(opensslv30). Fixes: QTBUG-107027 Change-Id: I481db3cdf3bbb1aa7127cc5498f0c0217df8c35b Reviewed-by: Mårten Nordheim --- tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'tests/auto/network') diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp index 20a84b3077..d4a1f510a9 100644 --- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp @@ -110,13 +110,8 @@ void tst_QSslCertificate::initTestCase() testDataDir = QCoreApplication::applicationDirPath(); if (!testDataDir.endsWith(QLatin1String("/"))) testDataDir += QLatin1String("/"); -#if QT_CONFIG(opensslv11) - // In the presence of 'openssl' backend, QSslSocket will - // select 'openssl' as the default one. + isNonOpenSslTls = QSslSocket::activeBackend() != QStringLiteral("openssl"); -#else - isNonOpenSslTls = true; -#endif // QT_CONFIG(ssl) QDir dir(testDataDir + "certificates"); QFileInfoList fileInfoList = dir.entryInfoList(QDir::Files | QDir::Readable); -- cgit v1.2.3