Fix tst_qsslkey to compile when SSL is disabled

Move it to the section requiring SSL tests since it requires QSslConfiguration. Change-Id: I5c807976ce75fa5967bddb8edd7788dbfbb89375 Reviewed-by: Mårten Nordheim <[email protected]>
goompean · Oct 23, 2020 · f6d09d4 · f6d09d4
1 parent 6681fa7
commit f6d09d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/tests/auto/network/ssl/CMakeLists.txt b/tests/auto/network/ssl/CMakeLists.txt
@@ -5,7 +5,9 @@ add_subdirectory(qsslcertificate)
 add_subdirectory(qsslcipher)
 add_subdirectory(qsslellipticcurve)
 add_subdirectory(qsslerror)
-add_subdirectory(qsslkey)
+if(QT_FEATURE_ssl)
+    add_subdirectory(qsslkey)
+endif()
 if(QT_FEATURE_private_tests AND QT_FEATURE_ssl)
     add_subdirectory(qsslsocket)
     add_subdirectory(qsslsocket_onDemandCertificates_member)

diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro
@@ -6,10 +6,10 @@ SUBDIRS=\
    qsslcertificate \
    qsslcipher \
    qsslellipticcurve \
-   qsslerror \
-   qsslkey \
+   qsslerror
 
 qtConfig(ssl) {
+    SUBDIRS += qsslkey
     qtConfig(private_tests) {
         SUBDIRS += \
             qsslsocket \