Skip to content

Commit cf2d52b

Browse files
author
Michal Klocek
committed
Fix deployment of render process on linux
When deployed on linux qwebengineprocess ends in libexec and needs qt.conf otherwise qt libraries prefix render process is unknown and running the process will fail. Pick-to: 6.9 6.8 Change-Id: If44d4689d11eb8a9f25e2aee28ddef73861575ad Reviewed-by: Joerg Bornemann <[email protected]> Reviewed-by: Alexandru Croitor <[email protected]>
1 parent 4b264b4 commit cf2d52b

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

src/core/api/Qt6WebEngineCoreDeploySupport.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,15 @@ function(_qt_internal_deploy_webenginecore_binary)
102102
)
103103
endif()
104104

105+
if(NOT __QT_DEPLOY_SYSTEM_NAME STREQUAL "Windows")
106+
qt6_deploy_qt_conf("${install_destination}/qt.conf"
107+
PREFIX "${QT_DEPLOY_PREFIX}"
108+
BIN_DIR "${QT_DEPLOY_BIN_DIR}"
109+
LIB_DIR "${QT_DEPLOY_LIB_DIR}"
110+
PLUGINS_DIR "${QT_DEPLOY_PLUGINS_DIR}"
111+
QML_DIR "${QT_DEPLOY_QML_DIR}"
112+
)
113+
endif()
105114
# Checking for __QT_DEPLOY_MUST_ADJUST_PLUGINS_RPATH is a bit strange because this is not a
106115
# plugin, but it gives a single common way to detect when the rpath adjustment must be done,
107116
# because the lib dir is different than the original Qt configured one.

0 commit comments

Comments
 (0)