windeployqt: Additionally check on Qt5WebKit[d].dll for ICU dependency.

Qt 5/Windows is no longer configured with -icu by default, only QtWebKit
still depends in it. Its library needs to be checked for ICU as well.

Task-number: QTBUG-45962
Change-Id: Ib08c2ece446f4f1cc4db2410fc0e554363181a6c
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index 89bf64440..f1b4b39e2 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -1063,11 +1063,13 @@ static DeployResult deploy(const Options &options,
         return result;
     }
 
-    // Some Windows-specific checks in QtCore: ICU
+    // Some Windows-specific checks: Qt5Core depends on ICU when configured with "-icu". Other than
+    // that, Qt5WebKit has a hard dependency on ICU.
     if (options.platform & WindowsBased)  {
-        const QStringList qt5Core = dependentQtLibs.filter(QStringLiteral("Qt5Core"), Qt::CaseInsensitive);
-        if (!qt5Core.isEmpty()) {
-            QStringList icuLibs = findDependentLibraries(qt5Core.front(), options.platform, errorMessage).filter(QStringLiteral("ICU"), Qt::CaseInsensitive);
+        const QStringList qtLibs = dependentQtLibs.filter(QStringLiteral("Qt5Core"), Qt::CaseInsensitive)
+            + dependentQtLibs.filter(QStringLiteral("Qt5WebKit"), Qt::CaseInsensitive);
+        foreach (const QString &qtLib, qtLibs) {
+            QStringList icuLibs = findDependentLibraries(qtLib, options.platform, errorMessage).filter(QStringLiteral("ICU"), Qt::CaseInsensitive);
             if (!icuLibs.isEmpty()) {
                 // Find out the ICU version to add the data library icudtXX.dll, which does not show
                 // as a dependency.
@@ -1088,8 +1090,9 @@ static DeployResult deploy(const Options &options,
                     }
                     dependentQtLibs.push_back(icuPath);
                 } // foreach icuLib
+                break;
             } // !icuLibs.isEmpty()
-        } // Qt5Core
+        } // Qt5Core/Qt5WebKit
     } // Windows
 
     // Scan Quick2 imports