From 70b57c943ad981ffe2e519fc0ab7176f83dafcd4 Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Wed, 30 Aug 2023 10:14:50 +0200 Subject: [PATCH] tst_qsslkey: Fix CMake condition Private libraries and WrapOpenSSL were linked conditional to QT_FEATURE_private_tests in the CMake file. qsslkey_p.h and open ssl symbols were included conditional to developer build. A developer build fails, with test enabled and private tests disabled. => Change the CMake condition to QT_FEATURE_developer_build, to resolve mismatch between CMake and cpp file. Pick-to: 6.6 6.5 Change-Id: I3ac93b02701e467a0b548c35d441d35a45c4568b Reviewed-by: Timur Pocheptsov --- tests/auto/network/ssl/qsslkey/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/network/ssl/qsslkey/CMakeLists.txt b/tests/auto/network/ssl/qsslkey/CMakeLists.txt index 1c5eaae9d1c..aae017562a5 100644 --- a/tests/auto/network/ssl/qsslkey/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslkey/CMakeLists.txt @@ -30,7 +30,7 @@ qt_internal_add_test(tst_qsslkey BUNDLE_ANDROID_OPENSSL_LIBS ) -qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests AND QT_FEATURE_openssl_linked +qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_developer_build AND QT_FEATURE_openssl_linked LIBRARIES WrapOpenSSL::WrapOpenSSL ) @@ -38,7 +38,7 @@ qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests AND QT_ ## Scopes: ##################################################################### -qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_developer_build LIBRARIES Qt::CorePrivate Qt::NetworkPrivate