From 09e34ba86c8cfd009d03b173e2156a403ddc49c0 Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Fri, 23 Oct 2026 23:20:10 +0200 Subject: [PATCH] Ensure Qt's TLS plugins are deployed on macOS For whatever reason, macdeployqt does not deploy the TLS plugins on its own. We need to find them manually. Fixes #13855 --- cmake/KPXCMacDeployHelpers.cmake | 6 ++++++ src/post_install/CMakeLists.txt | 9 +++++++++ vcpkg.json | 5 ++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/cmake/KPXCMacDeployHelpers.cmake b/cmake/KPXCMacDeployHelpers.cmake index 8d6ef8b2b..e23a88ba0 100644 --- a/cmake/KPXCMacDeployHelpers.cmake +++ b/cmake/KPXCMacDeployHelpers.cmake @@ -8,6 +8,7 @@ function(kpxc_run_macdeployqt_at_install_time) set(NO_VALUE_OPTIONS) set(SINGLE_VALUE_OPTIONS APP_NAME + TLS_PLUGIN_DIR ) set(MULTI_VALUE_OPTIONS EXTRA_BINARIES @@ -48,6 +49,11 @@ function(kpxc_run_macdeployqt_at_install_time) install(CODE " +if(IS_DIRECTORY \"${ARG_TLS_PLUGIN_DIR}\") + file(COPY \"${ARG_TLS_PLUGIN_DIR}/\" + DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${APP_BUNDLE_NAME}/Contents/PlugIns/tls\") +endif() + execute_process( COMMAND ${COMMAND_ARGS} ${COMMAND_ECHO} diff --git a/src/post_install/CMakeLists.txt b/src/post_install/CMakeLists.txt index 1adc4740b..b2c670647 100644 --- a/src/post_install/CMakeLists.txt +++ b/src/post_install/CMakeLists.txt @@ -6,8 +6,17 @@ if(APPLE AND WITH_APP_BUNDLE) # _MACDEPLOYQT_EXTRA_BINARIES global property. # All install(TARGETS) calls should have already been called. get_property(MACDEPLOYQT_EXTRA_BINARIES GLOBAL PROPERTY _MACDEPLOYQT_EXTRA_BINARIES) + find_path(QT_TLS_PLUGIN_DIR + NAMES libqopensslbackend.dylib libqsecuretransportbackend.dylib + HINTS "${Qt6_PREFIX}" + PATH_SUFFIXES + plugins/tls + Qt6/plugins/tls + qt/plugins/tls + ) kpxc_run_macdeployqt_at_install_time( APP_NAME "${PROGNAME}" + TLS_PLUGIN_DIR "${QT_TLS_PLUGIN_DIR}" EXTRA_BINARIES ${MACDEPLOYQT_EXTRA_BINARIES} ) endif() diff --git a/vcpkg.json b/vcpkg.json index 0cc17c5dd..d38d4db1c 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -29,7 +29,10 @@ "qt": { "description": "Build Qt6 dependency.", "dependencies": [ - "qtbase", + { + "name": "qtbase", + "features": ["network", "openssl"] + }, { "name": "qtbase", "platform": "linux | freebsd",