diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2019-07-10 23:14:52 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2019-07-11 13:42:22 +0000 |
commit | 758646871d3e637e8f6875252138f7e7f1387a28 (patch) | |
tree | 2f1d6301257b8d9d87aee9390986679836c29940 | |
parent | d26435fcadb71161caa1789e5ef26ace2e035073 (diff) |
Fix compare '<' operator for ToolchainInstallInfo
Change-Id: Ie411f0f2316a46eb8e6d4b39f5f1e8c20d8927eb
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/app/qbs-setup-toolchains/probe.h | 9 |
1 files changed, 7 insertions, 2 deletions
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 ¯oDump, const QByteArray &keyToken); |