windeployqt: Adjust to changes in QtWebEngine

There's now a debug version of QtWebEngineProcess which needs to be
deployed with debug builds of QtWebEngine-based applications.

Task-number: QTBUG-49493
Change-Id: Ie93f19c11ba5d49f8a23b615709021375b328080
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 11 insertions, 6 deletions

diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index 6c7835318..828a970f5 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -978,10 +978,12 @@ static bool deployTranslations(const QString &sourcePath, quint64 usedQtModules,
 
 struct DeployResult
 {
-    DeployResult() : success(false), directlyUsedQtLibraries(0), usedQtLibraries(0), deployedQtLibraries(0) {}
+    DeployResult() : success(false), isDebug(false), directlyUsedQtLibraries(0), usedQtLibraries(0),
+        deployedQtLibraries(0) {}
     operator bool() const { return success; }
 
     bool success;
+    bool isDebug;
     quint64 directlyUsedQtLibraries;
     quint64 usedQtLibraries;
     quint64 deployedQtLibraries;
@@ -1164,6 +1166,7 @@ static DeployResult deploy(const Options &options,
     }
 
     const bool isDebug = options.debugDetection == Options::DebugDetectionAuto ? detectedDebug: options.debugDetection == Options::DebugDetectionForceDebug;
+    result.isDebug = isDebug;
     const DebugMatchMode debugMatchMode = isDebug ? MatchDebug : MatchRelease;
 
     // Determine application type, check Quick2 is used by looking at the
@@ -1467,16 +1470,18 @@ static bool deployWebProcess(const QMap<QString, QString> &qmakeVariables,
 }
 
 static bool deployWebEngineCore(const QMap<QString, QString> &qmakeVariables,
-                                const Options &options, QString *errorMessage)
+                                const Options &options, bool isDebug, QString *errorMessage)
 {
     static const char *installDataFiles[] = {"icudtl.dat",
                                              "qtwebengine_resources.pak",
                                              "qtwebengine_resources_100p.pak",
                                              "qtwebengine_resources_200p.pak"};
-
+    QByteArray webEngineProcessName(webEngineProcessC);
+    if (isDebug)
+        webEngineProcessName.append('d');
     if (optVerboseLevel)
-        std::wcout << "Deploying: " << webEngineProcessC << "...\n";
-    if (!deployWebProcess(qmakeVariables, webEngineProcessC, options, errorMessage))
+        std::wcout << "Deploying: " << webEngineProcessName.constData() << "...\n";
+    if (!deployWebProcess(qmakeVariables, webEngineProcessName, options, errorMessage))
         return false;
     const QString resourcesSubDir = QStringLiteral("/resources");
     const QString resourcesSourceDir
@@ -1583,7 +1588,7 @@ int main(int argc, char **argv)
     }
 
     if (result.deployedQtLibraries & QtWebEngineCoreModule) {
-        if (!deployWebEngineCore(qmakeVariables, options, &errorMessage)) {
+        if (!deployWebEngineCore(qmakeVariables, options, result.isDebug, &errorMessage)) {
             std::wcerr << errorMessage << '\n';
             return 1;
         }