From f8bb798ade81f152bc8ff2028e4974150171fa08 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 7 Dec 2017 10:32:24 +0100 Subject: 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 --- src/windeployqt/main.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/windeployqt') 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()); } -- cgit v1.2.3