From 69f8463fddb295c927294b88b9f2252e48d2fac1 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Mon, 23 Mar 2015 11:53:07 +0100 Subject: [PATCH] Make compile with MSVC 2012 That compiler doesn't have variadic templates so std::tie takes at most 5 parameters. Change-Id: I9c8b56a3847be54a9cc4a5a356835efd8772ffa7 Reviewed-by: Friedemann Kleint Reviewed-by: Daniel Teske --- src/plugins/qmakeprojectmanager/qmakestep.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index 85891a7fff9..0f3fb7be4ba 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/src/plugins/qmakeprojectmanager/qmakestep.h @@ -114,8 +114,10 @@ public: inline bool operator ==(const QMakeStepConfig &a, const QMakeStepConfig &b) { - return std::tie(a.archConfig, a.osType, a.linkQmlDebuggingQQ1, a.linkQmlDebuggingQQ2, a.useQtQuickCompiler, a.separateDebugInfo) - == std::tie(b.archConfig, b.osType, b.linkQmlDebuggingQQ1, b.linkQmlDebuggingQQ2, b.useQtQuickCompiler, b.separateDebugInfo); + return std::tie(a.archConfig, a.osType, a.linkQmlDebuggingQQ1, a.linkQmlDebuggingQQ2) + == std::tie(b.archConfig, b.osType, b.linkQmlDebuggingQQ1, b.linkQmlDebuggingQQ2) + && std::tie(a.useQtQuickCompiler, a.separateDebugInfo) + == std::tie(b.useQtQuickCompiler, b.separateDebugInfo); } inline bool operator !=(const QMakeStepConfig &a, const QMakeStepConfig &b) {