diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-12-07 10:32:24 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-12-09 12:36:39 +0000 |
| commit | f8bb798ade81f152bc8ff2028e4974150171fa08 (patch) | |
| tree | 65701fb9cfbfde07148a21d0d7a07a77bef32cec | |
| parent | ba7fe8fe13fc4984b4cd162df1f3dafa92233664 (diff) | |
| download | qttools-f8bb798ade81f152bc8ff2028e4974150171fa08.tar.gz | |
windeployqt: Fix deployment of MSVC 2017 15.5 release redistributable
The file name was changed.
Task-number: QTBUG-65015
Change-Id: I0a81a42abae3bcf9b124acbea55ba4e275594016
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| -rw-r--r-- | src/windeployqt/main.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index a7008acb8..235080f5c 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -1118,9 +1118,12 @@ static QStringList compilerRunTimeLibs(Platform platform, bool isDebug, unsigned const QStringList countryCodes = vcRedistDir.entryList(QStringList(QStringLiteral("[0-9]*")), QDir::Dirs); if (!countryCodes.isEmpty()) // Pre MSVC2017 releaseRedistDir += QLatin1Char('/') + countryCodes.constFirst(); - const QFileInfo fi(releaseRedistDir + QLatin1Char('/') - + QStringLiteral("vcredist_") + wordSizeString - + QStringLiteral(".exe")); + QFileInfo fi(releaseRedistDir + QLatin1Char('/') + QStringLiteral("vc_redist.") + + wordSizeString + QStringLiteral(".exe")); + if (!fi.isFile()) { // Pre MSVC2017/15.5 + fi.setFile(releaseRedistDir + QLatin1Char('/') + QStringLiteral("vcredist_") + + wordSizeString + QStringLiteral(".exe")); + } if (fi.isFile()) redistFiles.append(fi.absoluteFilePath()); } |