From 4a3697e7f3563111a282fdc9e55faff740b0ebb8 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 13 Jul 2016 14:49:36 +0300 Subject: BuildGraphLocker: Include 5.7.0 in versions that have QTBUG-53392 It was fixed following v5.6.1, but was not merged into 5.7.0, only 5.7.1 will contain the fix. Change-Id: Iaeb300a1b2eb93c4984ed39439903773736201f3 Reviewed-by: Christian Kandeler --- src/lib/corelib/tools/buildgraphlocker.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/corelib/tools/buildgraphlocker.cpp b/src/lib/corelib/tools/buildgraphlocker.cpp index da804e1a8..11f14e4a7 100644 --- a/src/lib/corelib/tools/buildgraphlocker.cpp +++ b/src/lib/corelib/tools/buildgraphlocker.cpp @@ -52,8 +52,11 @@ static bool hasQtBug45497() static bool hasQtBug53392() { - return HostOsInfo::isWindowsHost() - && Version::fromString(QLatin1String(qVersion())) < Version(5, 6, 2); + if (!HostOsInfo::isWindowsHost()) + return false; + const Version qtVersion = Version::fromString(QLatin1String(qVersion())); + // The fix is included in 5.6.2 and 5.7.1, but not in 5.7.0. + return qtVersion == Version(5, 7, 0) || qtVersion < Version(5, 6, 2); } BuildGraphLocker::BuildGraphLocker(const QString &buildGraphFilePath, const Logger &logger) -- cgit v1.2.3