1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tst_qsslkey to compile when SSL is disabled

Browse Source 
Move it to the section requiring SSL tests since it
requires QSslConfiguration.

Change-Id: I5c807976ce75fa5967bddb8edd7788dbfbb89375
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Friedemann Kleint 2020-10-21 12:40:22 +02:00
parent 6681fa7b73
commit f6d09d426b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/network/ssl/CMakeLists.txt
View File

@ -5,7 +5,9 @@ add_subdirectory(qsslcertificate)
add_subdirectory(qsslcipher) add_subdirectory(qsslcipher)
add_subdirectory(qsslellipticcurve) add_subdirectory(qsslellipticcurve)
add_subdirectory(qsslerror) add_subdirectory(qsslerror)
add_subdirectory(qsslkey) if(QT_FEATURE_ssl)
add_subdirectory(qsslkey)
endif()
if(QT_FEATURE_private_tests AND QT_FEATURE_ssl) if(QT_FEATURE_private_tests AND QT_FEATURE_ssl)
add_subdirectory(qsslsocket) add_subdirectory(qsslsocket)
add_subdirectory(qsslsocket_onDemandCertificates_member) add_subdirectory(qsslsocket_onDemandCertificates_member)

4
tests/auto/network/ssl/ssl.pro
View File

@ -6,10 +6,10 @@ SUBDIRS=\
qsslcertificate \ qsslcertificate \
qsslcipher \ qsslcipher \
qsslellipticcurve \ qsslellipticcurve \
qsslerror \ qsslerror
qsslkey \
qtConfig(ssl) { qtConfig(ssl) {
SUBDIRS += qsslkey
qtConfig(private_tests) { qtConfig(private_tests) {
SUBDIRS += \ SUBDIRS += \
qsslsocket \ qsslsocket \