diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-04-15 17:16:04 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-04-15 17:16:04 +0300 |
| commit | fa4781b6691eff0d9eb2e9c8e536e9c09a23f054 (patch) | |
| tree | 416b3b3d0fdb89d19f951fae4b7ed779c0c32416 /tests/auto/core | |
| parent | 81047475209d3b78a06ec694f5d2aed9b325fe45 (diff) | |
| parent | 43cd26bfcd78f0b38f286f108ad7a04374695fce (diff) | |
Merge branch 'tqtc/lts-6.2.8' into 6.2.86.2.8
Change-Id: I87024a49104f1fc9b4418f7b7496a4a74de7eaa4
Diffstat (limited to 'tests/auto/core')
| -rw-r--r-- | tests/auto/core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/core/certificateerror/tst_certificateerror.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/core/CMakeLists.txt b/tests/auto/core/CMakeLists.txt index ecb3b2cf9..619c0358b 100644 --- a/tests/auto/core/CMakeLists.txt +++ b/tests/auto/core/CMakeLists.txt @@ -4,7 +4,7 @@ add_subdirectory(qwebengineurlrequestinterceptor) add_subdirectory(origins) add_subdirectory(devtools) -if(QT_FEATURE_ssl) +if(QT_FEATURE_ssl AND QT_VERSION VERSION_GREATER_EQUAL "6.4") add_subdirectory(qwebengineclientcertificatestore) add_subdirectory(certificateerror) endif() diff --git a/tests/auto/core/certificateerror/tst_certificateerror.cpp b/tests/auto/core/certificateerror/tst_certificateerror.cpp index 67e2d8ae4..fd22f5d63 100644 --- a/tests/auto/core/certificateerror/tst_certificateerror.cpp +++ b/tests/auto/core/certificateerror/tst_certificateerror.cpp @@ -105,7 +105,6 @@ void tst_CertificateError::handleError() QTRY_COMPARE_WITH_TIMEOUT(page.loadSpy.size(), 1, 30000); QCOMPARE(page.loadSpy.takeFirst().value(0).toBool(), acceptCertificate); QCOMPARE(toPlainTextSync(&page), expectedContent); - QVERIFY(server.stop()); } void tst_CertificateError::fatalError() |