From 061e1a8bbe5fb05b8f85811d55e805f54327d1d6 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 27 Jul 2017 09:15:46 +0200 Subject: 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: Oliver Wolff --- src/windeployqt/main.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index 7047395c4..090277ab4 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -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; } -- cgit v1.2.3