From 758646871d3e637e8f6875252138f7e7f1387a28 Mon Sep 17 00:00:00 2001
From: Denis Shienkov <denis.shienkov@gmail.com>
Date: Wed, 10 Jul 2019 23:14:52 +0300
Subject: Fix compare '<' operator for ToolchainInstallInfo

Change-Id: Ie411f0f2316a46eb8e6d4b39f5f1e8c20d8927eb
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/app/qbs-setup-toolchains/probe.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/app/qbs-setup-toolchains/probe.h b/src/app/qbs-setup-toolchains/probe.h
index 5e0ccc33c..0cac295d8 100644
--- a/src/app/qbs-setup-toolchains/probe.h
+++ b/src/app/qbs-setup-toolchains/probe.h
@@ -43,6 +43,8 @@
 
 #include <QtCore/qfileinfo.h>
 
+#include <tuple> // for std::tie
+
 QT_BEGIN_NAMESPACE
 class QString;
 class QStringList;
@@ -64,8 +66,11 @@ struct ToolchainInstallInfo
 };
 
 inline bool operator<(const ToolchainInstallInfo &lhs, const ToolchainInstallInfo &rhs)
-{ return lhs.compilerPath.absoluteFilePath() < rhs.compilerPath.absoluteFilePath()
-            || lhs.compilerVersion < rhs.compilerVersion; }
+{
+    const auto lp = lhs.compilerPath.absoluteFilePath();
+    const auto rp = rhs.compilerPath.absoluteFilePath();
+    return std::tie(lp, lhs.compilerVersion) < std::tie(rp, rhs.compilerVersion);
+}
 
 int extractVersion(const QByteArray &macroDump, const QByteArray &keyToken);
 
-- 
cgit v1.2.3