Commit 061e1a8b authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

windeployqt: Check folder "onecore" for MSVC debug redistributable files


It seems to be required depending on MSVC edition and installed
toolchains.

Task-number: QTBUG-61549
Change-Id: Iae800e9f37f1ca301731011e72f8d3223f3585c1
Reviewed-by: default avatarOliver Wolff <oliver.wolff@qt.io>
Showing with 4 additions and 1 deletion
......@@ -1048,7 +1048,10 @@ static QString vcRedistDir()
const QFileInfoList subDirs =
QDir(vc2017RedistDirName).entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Reversed);
for (const QFileInfo &f : subDirs) {
const QString path = f.absoluteFilePath();
QString path = f.absoluteFilePath();
if (QFileInfo(path + slash + vcDebugRedistDir()).isDir())
return path;
path += QStringLiteral("/onecore");
if (QFileInfo(path + slash + vcDebugRedistDir()).isDir())
return path;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment