diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-27 09:15:46 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-27 11:33:02 +0000 |
| commit | 061e1a8bbe5fb05b8f85811d55e805f54327d1d6 (patch) | |
| tree | 7d11838daeeecf0088275677bad23fb7417c0605 | |
| parent | b6f9aa2222dc9995c438346a735a6de7670fc718 (diff) | |
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 <oliver.wolff@qt.io>
| -rw-r--r-- | src/windeployqt/main.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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; } |