summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <[email protected]>2025-04-28 10:01:14 +0200
committerJoerg Bornemann <[email protected]>2025-05-07 16:09:50 +0000
commitd531d31e1db9a84a907c10f89b557c744100ab94 (patch)
tree4164b411c1778229178ed34a5d172e0586857814
parentd817747f8df76e39fab57aa8b668d451c9550058 (diff)
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.9 6.8 Change-Id: I58fa8a36e88369dd29f03fb16060b88ba08abd86 Reviewed-by: Joerg Bornemann <[email protected]>
-rw-r--r--src/tools/windeployqt/main.cpp21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp
index 2ef12d7455d..496fa512621 100644
--- a/src/tools/windeployqt/main.cpp
+++ b/src/tools/windeployqt/main.cpp
@@ -1858,13 +1858,20 @@ static bool deployWebEngineCore(const QMap<QString, QString> &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');