From 77a10188a5a03efff2590ef7dbc1bf13f79a3211 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Mon, 28 Apr 2025 10:01:14 +0200 Subject: [PATCH] Adjust webengine resources deployment In case of debug build install debug resources. The change reflects qtwebengine's deployment change: qtwebengine/76d317c082b2492cc1fe1fcf2afad26be5369d3f Task-number: QTBUG-131897 Pick-to: 6.8 Change-Id: I58fa8a36e88369dd29f03fb16060b88ba08abd86 Reviewed-by: Joerg Bornemann (cherry picked from commit d531d31e1db9a84a907c10f89b557c744100ab94) Reviewed-by: Qt Cherry-pick Bot --- src/tools/windeployqt/main.cpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp index afd099403fc..ca0a5a5dd8a 100644 --- a/src/tools/windeployqt/main.cpp +++ b/src/tools/windeployqt/main.cpp @@ -1864,13 +1864,20 @@ static bool deployWebEngineCore(const QMap &qtpathsVariables, const PluginInformation &pluginInfo, const Options &options, bool isDebug, QString *errorMessage) { - static const char *installDataFiles[] = { "icudtl.dat", - "qtwebengine_devtools_resources.pak", - "qtwebengine_resources.pak", - "qtwebengine_resources_100p.pak", - "qtwebengine_resources_200p.pak", - isDebug ? "v8_context_snapshot.debug.bin" - : "v8_context_snapshot.bin" }; + static const char *installDataFilesRelease[] = { "icudtl.dat", + "qtwebengine_devtools_resources.pak", + "qtwebengine_resources.pak", + "qtwebengine_resources_100p.pak", + "qtwebengine_resources_200p.pak", + "v8_context_snapshot.bin" }; + static const char *installDataFilesDebug[] = { "icudtl.dat", + "qtwebengine_devtools_resources.debug.pak", + "qtwebengine_resources.debug.pak", + "qtwebengine_resources_100p.debug.pak", + "qtwebengine_resources_200p.debug.pak", + "v8_context_snapshot.debug.bin" }; + static const auto &installDataFiles = isDebug ? installDataFilesDebug : installDataFilesRelease; + QByteArray webEngineProcessName(webEngineProcessC); if (isDebug && platformHasDebugSuffix(options.platform)) webEngineProcessName.append('d');