From 30d093b0e87e30a24b23a1b6203713cc20f84de9 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 20 Nov 2023 11:27:01 +0100 Subject: [PATCH] CMake: Prepare deployment of projects using QtWebEngine Store the locations of INSTALL_DATA and INSTALL_LIBEXECS in .qt/QtDeploySupport.cmake which is generated for every project. This information will be used to locate the helper binary and resources of QtWebEngine. Pick-to: 6.5 Task-number: QTBUG-119077 Change-Id: I2fb6f9b31fd1dcd872365d020c8ac71db426fdec Reviewed-by: Alexey Edelev (cherry picked from commit 32940a8ea42cb6d6edea662187ebc9146cbc9e29) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 640204df7b251d917ed9dcb2a6b3f3a3af874111) --- src/corelib/Qt6CoreMacros.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index ace59beb891..5b22d934640 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -2719,6 +2719,8 @@ set(__QT_DEFAULT_MAJOR_VERSION \"${QT_DEFAULT_MAJOR_VERSION}\") set(__QT_DEPLOY_QT_ADDITIONAL_PACKAGES_PREFIX_PATH \"${QT_ADDITIONAL_PACKAGES_PREFIX_PATH}\") set(__QT_DEPLOY_QT_INSTALL_PREFIX \"${QT6_INSTALL_PREFIX}\") set(__QT_DEPLOY_QT_INSTALL_BINS \"${QT6_INSTALL_BINS}\") +set(__QT_DEPLOY_QT_INSTALL_DATA \"${QT6_INSTALL_DATA}\") +set(__QT_DEPLOY_QT_INSTALL_LIBEXECS \"${QT6_INSTALL_LIBEXECS}\") set(__QT_DEPLOY_QT_INSTALL_PLUGINS \"${QT6_INSTALL_PLUGINS}\") set(__QT_DEPLOY_QT_INSTALL_TRANSLATIONS \"${QT6_INSTALL_TRANSLATIONS}\") set(__QT_DEPLOY_TARGET_QT_PATHS_PATH \"${target_qtpaths_path}\")