diff options
author | Kai Köhne <kai.koehne@qt.io> | 2021-10-20 16:02:44 +0200 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2021-10-21 16:11:12 +0200 |
commit | 52538a9d3d1ba10c638441666f8efbc78ba0b347 (patch) | |
tree | 7140803f4fd2704765756dade55a42eabc7c84a6 /src/windeployqt/main.cpp | |
parent | 5b2283926236a5bd5dc52401730eee8174f8022b (diff) |
windeployqt: Do expect host to be Windows 10
Change-Id: I54e8b037b0d49d07fd45f867efbe945892c6c799
Reviewed-by: Yuhang Zhao <2546789017@qq.com>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/windeployqt/main.cpp')
-rw-r--r-- | src/windeployqt/main.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index eacbe649d..9a8134e92 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -1085,16 +1085,13 @@ static QString vcRedistDir() const QFileInfoList subDirs = QDir(vcRedistDirName) .entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Reversed); - const bool isWindows10 = QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10; for (const QFileInfo &f : subDirs) { QString path = f.absoluteFilePath(); if (QFileInfo(path + slash + vcDebugRedistDir()).isDir()) return path; - if (isWindows10) { - path += QStringLiteral("/onecore"); - if (QFileInfo(path + slash + vcDebugRedistDir()).isDir()) - return path; - } + path += QStringLiteral("/onecore"); + if (QFileInfo(path + slash + vcDebugRedistDir()).isDir()) + return path; } std::wcerr << "Warning: Cannot find Visual Studio redist directory under " << QDir::toNativeSeparators(vcRedistDirName).toStdWString() << ".\n"; |