1 files changed, 18 insertions, 5 deletions
diff --git a/src/plugins/tls/openssl/CMakeLists.txt b/src/plugins/tls/openssl/CMakeLists.txt
index 4e1c711aa8..0e0a7a1552 100644
--- a/src/plugins/tls/openssl/CMakeLists.txt
+++ b/src/plugins/tls/openssl/CMakeLists.txt
@@ -1,7 +1,10 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 qt_internal_add_plugin(QTlsBackendOpenSSLPlugin
-    OUTPUT_NAME opensslbackend
+    OUTPUT_NAME qopensslbackend
     CLASS_NAME QTlsBackendOpenSSL
-    TYPE tls
+    PLUGIN_TYPE tls
     SOURCES
         ../shared/qx509_base.cpp ../shared/qx509_base_p.h
         ../shared/qtlskey_base.cpp ../shared/qtlskey_base_p.h
@@ -21,6 +24,10 @@ qt_internal_add_plugin(QTlsBackendOpenSSLPlugin
         OPENSSL_API_COMPAT=0x10100000L
 )
 
+if (WIN32) # Windows header issues
+    set_target_properties(QTlsBackendOpenSSLPlugin PROPERTIES UNITY_BUILD OFF)
+endif()
+
 qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION QT_FEATURE_dtls
     SOURCES
         qdtls_openssl.cpp qdtls_openssl_p.h
@@ -35,16 +42,22 @@ qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION APPLE
         ${FWSecurity}
 )
 
-qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION ANDROID AND NOT ANDROID_EMBEDDED
+qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION ANDROID
     SOURCES
         qsslsocket_openssl_android.cpp
 )
 
-qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION QT_FEATURE_openssl
-                          AND QT_FEATURE_ssl AND WIN32
+qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION WIN32
     SOURCES
         qwindowscarootfetcher.cpp qwindowscarootfetcher_p.h
         ../shared/qwincrypt_p.h
     LIBRARIES
         crypt32
 )
+
+if(QT_FEATURE_openssl_linked)
+    target_link_libraries(QTlsBackendOpenSSLPlugin PRIVATE WrapOpenSSL::WrapOpenSSL)
+else()
+    qt_internal_add_target_include_dirs(QTlsBackendOpenSSLPlugin
+                                        WrapOpenSSLHeaders::WrapOpenSSLHeaders)
+endif()