mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 14:29:53 +08:00
88de49b139
* Patch windeployqt to locate icudtd correctly. * Add the link of the upstream issue as a comment to the patch in the portfile.
14 lines
962 B
Diff
14 lines
962 B
Diff
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
|
|
index 4e480bb..e15f076 100644
|
|
--- a/src/windeployqt/main.cpp
|
|
+++ b/src/windeployqt/main.cpp
|
|
@@ -1324,7 +1324,7 @@ static DeployResult deploy(const Options &options,
|
|
const QString icuVersion = icuLibs.front().mid(index, numberExpression.matchedLength());
|
|
if (optVerboseLevel > 1)
|
|
std::wcout << "Adding ICU version " << icuVersion << '\n';
|
|
- icuLibs.push_back(QStringLiteral("icudt") + icuVersion + QLatin1String(windowsSharedLibrarySuffix));
|
|
+ icuLibs.push_back(QStringLiteral("icudt") + (result.isDebug && platformHasDebugSuffix(options.platform) ? QStringLiteral("d") : QString()) + icuVersion + QLatin1String(windowsSharedLibrarySuffix));
|
|
}
|
|
for (const QString &icuLib : qAsConst(icuLibs)) {
|
|
const QString icuPath = findInPath(icuLib);
|